diff --git a/install/package.json b/install/package.json index 2e21530830..dcf1cb14fb 100644 --- a/install/package.json +++ b/install/package.json @@ -106,7 +106,7 @@ "nodebb-theme-harmony": "1.2.3", "nodebb-theme-lavender": "7.1.7", "nodebb-theme-peace": "2.2.0", - "nodebb-theme-persona": "13.3.1", + "nodebb-theme-persona": "13.3.2", "nodebb-widget-essentials": "7.0.14", "nodemailer": "6.9.8", "nprogress": "0.2.0", @@ -132,7 +132,7 @@ "socket.io": "4.7.4", "socket.io-client": "4.7.4", "@socket.io/redis-adapter": "8.2.1", - "sortablejs": "1.15.1", + "sortablejs": "1.15.2", "spdx-license-list": "6.8.0", "spider-detector": "2.0.1", "terser-webpack-plugin": "5.3.10", diff --git a/public/language/ar/admin/dashboard.json b/public/language/ar/admin/dashboard.json index 584e28374b..b44c50d859 100644 --- a/public/language/ar/admin/dashboard.json +++ b/public/language/ar/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/bg/admin/dashboard.json b/public/language/bg/admin/dashboard.json index 1702728fc7..d7839ed1ff 100644 --- a/public/language/bg/admin/dashboard.json +++ b/public/language/bg/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "Преглед като JSON", "expand-analytics": "Разгъване на данните за анализ", "clear-search-history": "Изчистване на историята на търсенията", - "clear-search-history-confirm": "Наистина ли искате да изчистите историята на търсенията?" + "clear-search-history-confirm": "Наистина ли искате да изчистите историята на търсенията?", + "search-term": "Фраза", + "search-count": "Брой", + "view-all": "Преглед на всички" } diff --git a/public/language/bg/search.json b/public/language/bg/search.json index 4c72793dae..0d85e4a27d 100644 --- a/public/language/bg/search.json +++ b/public/language/bg/search.json @@ -7,7 +7,7 @@ "in-titles": "В заглавията", "in-titles-posts": "В заглавията и публикациите", "in-posts": "В публикациите", - "in-bookmarks": "In bookmarks", + "in-bookmarks": "В отметките", "in-categories": "В категориите", "in-users": "В потребителите", "in-tags": "В етикетите", diff --git a/public/language/bn/admin/dashboard.json b/public/language/bn/admin/dashboard.json index 681c202f47..6ad973f5f3 100644 --- a/public/language/bn/admin/dashboard.json +++ b/public/language/bn/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/cs/admin/dashboard.json b/public/language/cs/admin/dashboard.json index 8d7013572b..ad5fd7cd94 100644 --- a/public/language/cs/admin/dashboard.json +++ b/public/language/cs/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/da/admin/dashboard.json b/public/language/da/admin/dashboard.json index a3436a43f7..98aeb80e34 100644 --- a/public/language/da/admin/dashboard.json +++ b/public/language/da/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/de/admin/dashboard.json b/public/language/de/admin/dashboard.json index 9037ec9ce5..ceb163174b 100644 --- a/public/language/de/admin/dashboard.json +++ b/public/language/de/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "Als JSON anzeigen", "expand-analytics": "Analytik erweitern", "clear-search-history": "Suchverlauf löschen", - "clear-search-history-confirm": "Bist du dir sicher, dass du den gesamten Suchverlauf löschen möchten?" + "clear-search-history-confirm": "Bist du dir sicher, dass du den gesamten Suchverlauf löschen möchten?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/el/admin/dashboard.json b/public/language/el/admin/dashboard.json index 681c202f47..6ad973f5f3 100644 --- a/public/language/el/admin/dashboard.json +++ b/public/language/el/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/en-GB/admin/dashboard.json b/public/language/en-GB/admin/dashboard.json index 681c202f47..6ad973f5f3 100644 --- a/public/language/en-GB/admin/dashboard.json +++ b/public/language/en-GB/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/en-US/admin/dashboard.json b/public/language/en-US/admin/dashboard.json index 681c202f47..6ad973f5f3 100644 --- a/public/language/en-US/admin/dashboard.json +++ b/public/language/en-US/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/en-x-pirate/admin/dashboard.json b/public/language/en-x-pirate/admin/dashboard.json index 681c202f47..6ad973f5f3 100644 --- a/public/language/en-x-pirate/admin/dashboard.json +++ b/public/language/en-x-pirate/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/es/admin/dashboard.json b/public/language/es/admin/dashboard.json index 642065819c..5877b7f14f 100644 --- a/public/language/es/admin/dashboard.json +++ b/public/language/es/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/et/admin/dashboard.json b/public/language/et/admin/dashboard.json index 681c202f47..6ad973f5f3 100644 --- a/public/language/et/admin/dashboard.json +++ b/public/language/et/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/fa-IR/admin/dashboard.json b/public/language/fa-IR/admin/dashboard.json index b5fc4c9f28..e79db14d13 100644 --- a/public/language/fa-IR/admin/dashboard.json +++ b/public/language/fa-IR/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/fi/admin/dashboard.json b/public/language/fi/admin/dashboard.json index 4113ed55bd..0ea641a71d 100644 --- a/public/language/fi/admin/dashboard.json +++ b/public/language/fi/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/fr/admin/dashboard.json b/public/language/fr/admin/dashboard.json index dfa794d085..c8074a1e7c 100644 --- a/public/language/fr/admin/dashboard.json +++ b/public/language/fr/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "Afficher en JSON", "expand-analytics": "Développer les statistiques", "clear-search-history": "Effacer l'historique", - "clear-search-history-confirm": "Êtes-vous sûr de vouloir effacer tout l'historique de recherche ?" + "clear-search-history-confirm": "Êtes-vous sûr de vouloir effacer tout l'historique de recherche ?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/gl/admin/dashboard.json b/public/language/gl/admin/dashboard.json index 681c202f47..6ad973f5f3 100644 --- a/public/language/gl/admin/dashboard.json +++ b/public/language/gl/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/he/admin/dashboard.json b/public/language/he/admin/dashboard.json index 77d70892f6..a1aeceeff0 100644 --- a/public/language/he/admin/dashboard.json +++ b/public/language/he/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "הצג כ-JSON", "expand-analytics": "הרחב ניתוח", "clear-search-history": "מחק היסטוריית חיפושים", - "clear-search-history-confirm": "האם אתה בטוח שברצונך למחוק את כל היסטוריית החיפושים?" + "clear-search-history-confirm": "האם אתה בטוח שברצונך למחוק את כל היסטוריית החיפושים?", + "search-term": "מונח", + "search-count": "כמות", + "view-all": "הצג הכל" } diff --git a/public/language/he/search.json b/public/language/he/search.json index da0fb150ba..93dbdd6272 100644 --- a/public/language/he/search.json +++ b/public/language/he/search.json @@ -7,7 +7,7 @@ "in-titles": "בכותרות הנושאים", "in-titles-posts": "בכותרות ובפוסטים", "in-posts": "בפוסטים", - "in-bookmarks": "In bookmarks", + "in-bookmarks": "במועדפים", "in-categories": "בקטגוריות", "in-users": "במשתמשים", "in-tags": "בתגיות", diff --git a/public/language/hr/admin/dashboard.json b/public/language/hr/admin/dashboard.json index ad7919906e..1e4fedf429 100644 --- a/public/language/hr/admin/dashboard.json +++ b/public/language/hr/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/hu/admin/dashboard.json b/public/language/hu/admin/dashboard.json index 3dd5958b6e..2667ac9af7 100644 --- a/public/language/hu/admin/dashboard.json +++ b/public/language/hu/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/hy/admin/dashboard.json b/public/language/hy/admin/dashboard.json index 78ac928a72..5e4f140474 100644 --- a/public/language/hy/admin/dashboard.json +++ b/public/language/hy/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "Դիտել որպես JSON", "expand-analytics": "Ընդլայնել վերլուծությունը", "clear-search-history": "Մաքրել որոնման պատմությունը", - "clear-search-history-confirm": "Վստա՞հ եք, որ ցանկանում եք մաքրել որոնման ողջ պատմությունը:" + "clear-search-history-confirm": "Վստա՞հ եք, որ ցանկանում եք մաքրել որոնման ողջ պատմությունը:", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/id/admin/dashboard.json b/public/language/id/admin/dashboard.json index 681c202f47..6ad973f5f3 100644 --- a/public/language/id/admin/dashboard.json +++ b/public/language/id/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/it/admin/dashboard.json b/public/language/it/admin/dashboard.json index 53bef3d279..bc701ab86e 100644 --- a/public/language/it/admin/dashboard.json +++ b/public/language/it/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "Visualizza come JSON", "expand-analytics": "Espandi l'analisi", "clear-search-history": "Cancella cronologia delle ricerche", - "clear-search-history-confirm": "Sei sicuro di voler cancellare l'intera cronologia delle ricerche?" + "clear-search-history-confirm": "Sei sicuro di voler cancellare l'intera cronologia delle ricerche?", + "search-term": "Termine", + "search-count": "Conteggio", + "view-all": "Mostra tutto" } diff --git a/public/language/it/search.json b/public/language/it/search.json index cb67e4de6a..2d2912aa11 100644 --- a/public/language/it/search.json +++ b/public/language/it/search.json @@ -7,7 +7,7 @@ "in-titles": "Nei titoli", "in-titles-posts": "Nei titoli e nei post", "in-posts": "Nei post", - "in-bookmarks": "In bookmarks", + "in-bookmarks": "Nei segnalibri", "in-categories": "Nelle categorie", "in-users": "Negli utenti", "in-tags": "Nei tag", diff --git a/public/language/it/topic.json b/public/language/it/topic.json index d5564eb93e..174ecc291f 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -128,7 +128,7 @@ "confirm-move": "Sposta", "confirm-fork": "Dividi", "bookmark": "Favorito", - "bookmarks": "Favoriti", + "bookmarks": "Segnalibri", "bookmarks.has-no-bookmarks": "Non hai ancora aggiunto alcun post ai segnalibri.", "copy-permalink": "Copia link permanente", "loading-more-posts": "Caricamento altri post", diff --git a/public/language/it/user.json b/public/language/it/user.json index 2925e2013d..e8d84b12aa 100644 --- a/public/language/it/user.json +++ b/public/language/it/user.json @@ -34,7 +34,7 @@ "profile": "Profilo", "profile-views": "Visite al profilo", "reputation": "Reputazione", - "bookmarks": "Preferiti", + "bookmarks": "Segnalibri", "watched-categories": "Categorie seguite", "watched-tags": "Tag seguiti", "change-all": "Cambia Tutto", diff --git a/public/language/ja/admin/dashboard.json b/public/language/ja/admin/dashboard.json index 936a823210..60e2fad225 100644 --- a/public/language/ja/admin/dashboard.json +++ b/public/language/ja/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/ko/admin/dashboard.json b/public/language/ko/admin/dashboard.json index 4f3677be07..c437a21222 100644 --- a/public/language/ko/admin/dashboard.json +++ b/public/language/ko/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/lt/admin/dashboard.json b/public/language/lt/admin/dashboard.json index 681c202f47..6ad973f5f3 100644 --- a/public/language/lt/admin/dashboard.json +++ b/public/language/lt/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/lv/admin/dashboard.json b/public/language/lv/admin/dashboard.json index 37c238865f..ee1358bb7b 100644 --- a/public/language/lv/admin/dashboard.json +++ b/public/language/lv/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/ms/admin/dashboard.json b/public/language/ms/admin/dashboard.json index 681c202f47..6ad973f5f3 100644 --- a/public/language/ms/admin/dashboard.json +++ b/public/language/ms/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/nb/admin/dashboard.json b/public/language/nb/admin/dashboard.json index 902e55a91e..857478123e 100644 --- a/public/language/nb/admin/dashboard.json +++ b/public/language/nb/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/nb/admin/settings/user.json b/public/language/nb/admin/settings/user.json index 3f30cf6625..3d46711e85 100644 --- a/public/language/nb/admin/settings/user.json +++ b/public/language/nb/admin/settings/user.json @@ -29,8 +29,8 @@ "session-time-days": "Dager", "session-time-seconds": "Sekunder", "session-time-help": "Disse verdiene brukes for å følge med på hvor lenge en bruker er logget inn når de sjekker "Remember Me" ved pålogging. Merk at kun en av disse verdiene brukes. Hvis det ikke er sekundverdi bruker vi dager. Hvis det ikke er noen verdier for dager faller verdien tilbake til 14 dager.", - "session-duration": "Session length if \"Remember Me\" is not checked (seconds)", - "session-duration-help": "By default — or if set to 0 — a user will stay logged in for the duration of the session (e.g. however long the browser window/tab remains open). Set this value to explicitly invalidate the session after the specified number of seconds.", + "session-duration": "Øktlengde hvis \"Husk meg\" ikke er merket av (sekunder)", + "session-duration-help": "Som standard – eller hvis satt til 0 – vil en bruker forbli pålogget i løpet av økten (f.eks. hvor lenge nettleservinduet/fanen forblir åpen). Angi denne verdien for å eksplisitt ugyldiggjøre økten etter det angitte antallet sekunder.", "online-cutoff": "Minutter etter at bruker er ansett som inaktiv ", "online-cutoff-help": "Hvis brukeren ikke utfører noen handlinger for den bestemte varigheten, anses de som inaktive, og de mottar ikke sanntidsoppdateringer.", "registration": "Brukerregistrering", @@ -78,7 +78,7 @@ "follow-created-topics": "Følg tråder du lager", "follow-replied-topics": "Følg tråder du svarer på", "default-notification-settings": "Standard varslingsinnstillinger", - "categoryWatchState": "Default category watch state", + "categoryWatchState": "Standard kategori overvåkingstatus", "categoryWatchState.tracking": "Sporing", "categoryWatchState.notwatching": "Overvåker ikke", "categoryWatchState.ignoring": "Ignorerer", diff --git a/public/language/nb/category.json b/public/language/nb/category.json index 3f96a2e6d1..2cf50012f7 100644 --- a/public/language/nb/category.json +++ b/public/language/nb/category.json @@ -13,9 +13,9 @@ "tracking": "Sporing", "not-watching": "Følger ikke", "ignoring": "Ignorerer", - "watching.description": "Notify me of new topics.
Show topics in unread & recent", - "tracking.description": "Shows topics in unread & recent", - "not-watching.description": "Ikke vis emner i ulest, vis nylig", + "watching.description": "Varsle meg om nye emner.
Vis emner i ulest og nylig", + "tracking.description": "Vis emner i ulest og nylig", + "not-watching.description": "Ikke vis emner i ulest, vis i nylig", "ignoring.description": "Do not show topics in unread & recent", "watching.message": "Du ser nå på oppdateringer fra denne kategorien og alle underkategorier", "tracking.message": "You are now tracking updates from this category and all subcategories", diff --git a/public/language/nb/modules.json b/public/language/nb/modules.json index b9b2dcf3af..6db2ca6b21 100644 --- a/public/language/nb/modules.json +++ b/public/language/nb/modules.json @@ -96,7 +96,7 @@ "composer.formatting.heading6": "Heading 6", "composer.formatting.list": "Liste", "composer.formatting.strikethrough": "Gjennomstreking", - "composer.formatting.code": "Code", + "composer.formatting.code": "Kode", "composer.formatting.link": "Lenke", "composer.formatting.picture": "Bildelenke", "composer.upload-picture": "Last opp bilde", @@ -117,7 +117,7 @@ "bootbox.ok": "OK", "bootbox.cancel": "Avbryt", "bootbox.confirm": "Bekreft", - "bootbox.submit": "Submit", + "bootbox.submit": "Send inn", "bootbox.send": "Send", "cover.dragging-title": "Posisjoner bilde", "cover.dragging-message": "Drag the cover photo to the desired position and click \"Save\"", diff --git a/public/language/nb/register.json b/public/language/nb/register.json index 96867d8d13..39ebc50b3b 100644 --- a/public/language/nb/register.json +++ b/public/language/nb/register.json @@ -1,6 +1,6 @@ { "register": "Registrer", - "already-have-account": "Already have an account?", + "already-have-account": "Har du allerede en bruker?", "cancel-registration": "Avbryt registrering", "help.email": "Som standard, holdes din e-post skjult for offentligheten.", "help.username-restrictions": "Et unikt brukernavn mellom %1 og %2 tegn. Andre kan nevne deg med @brukernavn.", diff --git a/public/language/nb/rewards.json b/public/language/nb/rewards.json index f923cf1500..6a61146596 100644 --- a/public/language/nb/rewards.json +++ b/public/language/nb/rewards.json @@ -1,10 +1,10 @@ { - "awarded-x-reputation": "You have been awarded %1 reputation", - "awarded-group-membership": "You have been added to the group %1", + "awarded-x-reputation": "Du har blitt tildelt 1% rykte", + "awarded-group-membership": "Du har blitt lag til i gruppen 1%", - "essentials/user.reputation-conditional-value": "(Reputation %1 %2)", - "essentials/user.postcount-conditional-value": "(Post Count %1 %2)", - "essentials/user.lastonline-conditional-value": "(Last Online %1 %2)", - "essentials/user.joindate-conditional-value": "(Join Date %1 %2)", - "essentials/user.daysregistered-conditional-value": "(Days Registered %1 %2)" + "essentials/user.reputation-conditional-value": "(Rykte %1 %2)", + "essentials/user.postcount-conditional-value": "(Antall innlegg %1 %2)", + "essentials/user.lastonline-conditional-value": "(Sist pålogget %1 %2)", + "essentials/user.joindate-conditional-value": "(Innmeldingsdato %1 %2)", + "essentials/user.daysregistered-conditional-value": "(Antall dager registrert %1 %2)" } \ No newline at end of file diff --git a/public/language/nb/search.json b/public/language/nb/search.json index 9e80084d95..b497570d93 100644 --- a/public/language/nb/search.json +++ b/public/language/nb/search.json @@ -1,43 +1,43 @@ { - "type-to-search": "Type to search", + "type-to-search": "Skriv for å søke", "results-matching": "%1 resultat(er) samsvarer med \"%2\", (%3 sekunder)", "no-matches": "Ingen matcher funnet", "advanced-search": "Avansert søk", "in": "I", - "in-titles": "In titles", - "in-titles-posts": "In titles and posts", - "in-posts": "In posts", - "in-bookmarks": "In bookmarks", - "in-categories": "In categories", - "in-users": "In users", - "in-tags": "In tags", - "categories": "Categories", - "all-categories": "All categories", - "categories-x": "Categories: %1", - "categories-watched-categories": "Categories: Watched categories", - "type-a-category": "Type a category", - "tags": "Tags", - "tags-x": "Tags: %1", - "type-a-tag": "Type a tag", + "in-titles": "I titler", + "in-titles-posts": "I tiler og innlegg", + "in-posts": "I innlegg", + "in-bookmarks": "I bokmerker", + "in-categories": "I kategorier", + "in-users": "I brukere", + "in-tags": "I emneord", + "categories": "Kategorier", + "all-categories": "Alle kategorier", + "categories-x": "Kategorier: %1", + "categories-watched-categories": "Kategorier: Overvåkede kategorier", + "type-a-category": "Skriv inn en kategori", + "tags": "Emneord", + "tags-x": "Emneord: %1", + "type-a-tag": "Skriv inn et emneord", "match-words": "Match ord", - "match-all-words": "Match all words", - "match-any-word": "Match any word", + "match-all-words": "Match alle ord", + "match-any-word": "Match hvilket som helst ord", "all": "Alle", "any": "Hvilken som helst", "posted-by": "Skapt av", - "posted-by-usernames": "Posted by: %1", - "type-a-username": "Type a username", + "posted-by-usernames": "Publisert av: %1", + "type-a-username": "Skriv inn et brukernavn", "search-child-categories": "Søk underkategorier", "has-tags": "Har emneord", "reply-count": "Mengde svar", - "replies": "Replies", - "replies-atleast-count": "Replies: At least %1", - "replies-atmost-count": "Replies: At most %1", + "replies": "Svarer", + "replies-atleast-count": "Svar: Minst %1", + "replies-atmost-count": "Svar: På det meste %1", "at-least": "Minst", "at-most": "Maks", "relevance": "Relevanse", - "time": "Time", - "post-time": "Innlegg-tid", + "time": "Tid", + "post-time": "Tidspunkt for innlegg", "votes": "Stemmer", "newer-than": "Nyere enn", "older-than": "Eldre en", @@ -49,22 +49,22 @@ "three-months": "Tre måneder", "six-months": "Seks måneder", "one-year": "Ett år", - "time-newer-than-86400": "Time: Newer than yesterday", - "time-older-than-86400": "Time: Older than yesterday", - "time-newer-than-604800": "Time: Newer than one week", - "time-older-than-604800": "Time: Older than one week", - "time-newer-than-1209600": "Time: Newer than two weeks", - "time-older-than-1209600": "Time: Older than two weeks", - "time-newer-than-2592000": "Time: Newer than one month", - "time-older-than-2592000": "Time: Older than one month", - "time-newer-than-7776000": "Time: Newer than three months", - "time-older-than-7776000": "Time: Older than three months", - "time-newer-than-15552000": "Time: Newer than six months", - "time-older-than-15552000": "Time: Older than six months", - "time-newer-than-31104000": "Time: Newer than one year", - "time-older-than-31104000": "Time: Older than one year", + "time-newer-than-86400": "Tid: Nyere enn i går", + "time-older-than-86400": "Tid: Eldre enn i går", + "time-newer-than-604800": "Tid: Nyere enn en uke", + "time-older-than-604800": "Tid: Eldre enn en uke", + "time-newer-than-1209600": "Tid. Nyere enn to uker", + "time-older-than-1209600": "Tid: Eldre enn to uker", + "time-newer-than-2592000": "Tid: Nyere enn en måned", + "time-older-than-2592000": "Tid: Eldre enn en måned", + "time-newer-than-7776000": "Tid: Nyere enn tre måneder", + "time-older-than-7776000": "Tid: Eldre enn tre måneder", + "time-newer-than-15552000": "Tid: Nyere enn seks måneder", + "time-older-than-15552000": "Tid: Eldre enn seks måneder", + "time-newer-than-31104000": "Tid: Nyere enn ett år", + "time-older-than-31104000": "Tid: Eldre enn ett år", "sort-by": "Sorter etter", - "sort": "Sort", + "sort": "Sortere", "last-reply-time": "Siste svartid", "topic-title": "Tråd-tittel", "topic-votes": "Stemmer på emne", @@ -75,36 +75,36 @@ "category": "Kategori", "descending": "I synkende rekkefølge", "ascending": "I stigende rekkefølge", - "sort-by-relevance-desc": "Sort by: Relevance in descending order", - "sort-by-relevance-asc": "Sort by: Relevance in ascending order", - "sort-by-timestamp-desc": "Sort by: Post time in descending order", - "sort-by-timestamp-asc": "Sort by: Post time in ascending order", - "sort-by-votes-desc": "Sort by: Votes in descending order", - "sort-by-votes-asc": "Sort by: Votes in ascending order", - "sort-by-topic.lastposttime-desc": "Sort by: Last reply time in descending order", - "sort-by-topic.lastposttime-asc": "Sort by: Last reply time in ascending order", - "sort-by-topic.title-desc": "Sort by: Topic title in descending order", - "sort-by-topic.title-asc": "Sort by: Topic title in ascending order", - "sort-by-topic.postcount-desc": "Sort by: Number of replies in descending order", - "sort-by-topic.postcount-asc": "Sort by: Number of replies in ascending order", - "sort-by-topic.viewcount-desc": "Sort by: Number of views in descending order", - "sort-by-topic.viewcount-asc": "Sort by: Number of views in ascending order", - "sort-by-topic.votes-desc": "Sort by: Topic votes in descending order", - "sort-by-topic.votes-asc": "Sort by: Topic votes in ascending order", - "sort-by-topic.timestamp-desc": "Sort by: Topic start date in descending order", - "sort-by-topic.timestamp-asc": "Sort by: Topic start date in ascending order", - "sort-by-user.username-desc": "Sort by: Username in descending order", - "sort-by-user.username-asc": "Sort by: Username in ascending order", - "sort-by-category.name-desc": "Sort by: Category in descending order", - "sort-by-category.name-asc": "Sort by: Category in ascending order", - "save": "Save", + "sort-by-relevance-desc": "Sorter etter: Relevans i synkende rekkefølge", + "sort-by-relevance-asc": "Sorter etter: Relevans i synkende rekkefølge", + "sort-by-timestamp-desc": "Sorter etter: Innleggstid i synkende rekkefølge", + "sort-by-timestamp-asc": "Sorter etter: Posttid i stigende rekkefølge", + "sort-by-votes-desc": "Sorter etter: Stemmer i synkende rekkefølge", + "sort-by-votes-asc": "Sorter etter: Stemmer i stigende rekkefølge", + "sort-by-topic.lastposttime-desc": "Sorter etter: Siste svartid i synkende rekkefølge", + "sort-by-topic.lastposttime-asc": "Sorter etter: Siste svartid i stigende rekkefølge", + "sort-by-topic.title-desc": "Sorter etter: Emnetittel i synkende rekkefølge", + "sort-by-topic.title-asc": "Sorter etter: Emnetittel i stigende rekkefølge", + "sort-by-topic.postcount-desc": "Sorter etter: Antall svar i synkende rekkefølge", + "sort-by-topic.postcount-asc": "Sorter etter: Antall svar i stigende rekkefølge", + "sort-by-topic.viewcount-desc": "Sorter etter: Antall visninger i synkende rekkefølge", + "sort-by-topic.viewcount-asc": "Sorter etter: Antall visninger i stigende rekkefølge", + "sort-by-topic.votes-desc": "Sorter etter: Emnestemmer i synkende rekkefølge", + "sort-by-topic.votes-asc": "Sorter etter: Temastemmer i stigende rekkefølge", + "sort-by-topic.timestamp-desc": "Sorter etter: Emnets startdato i synkende rekkefølge", + "sort-by-topic.timestamp-asc": "Sorter etter: Emnets startdato i stigende rekkefølge", + "sort-by-user.username-desc": "Sorter etter: Brukernavn i synkende rekkefølge", + "sort-by-user.username-asc": "Sorter etter: Brukernavn i stigende rekkefølge", + "sort-by-category.name-desc": "Sorter etter: Kategori i synkende rekkefølge", + "sort-by-category.name-asc": "Sorter etter: Kategori i stigende rekkefølge", + "save": "Lagre", "save-preferences": "Lagre innstillinger", "clear-preferences": "Tøm innstillinnger", "search-preferences-saved": "Søkeinnstillinger lagret", "search-preferences-cleared": "Søkeinnstillinger tømt", "show-results-as": "Vis resultater som", "show-results-as-topics": "Show results as topics", - "show-results-as-posts": "Show results as posts", + "show-results-as-posts": "Vis resultater som innlegg", "see-more-results": "Se flere resultater (%1)", "search-in-category": "Søk i \"%1\"" } \ No newline at end of file diff --git a/public/language/nb/tags.json b/public/language/nb/tags.json index 9084caaa87..a575294794 100644 --- a/public/language/nb/tags.json +++ b/public/language/nb/tags.json @@ -1,17 +1,17 @@ { "all-tags": "All tags", "no-tag-topics": "Det er ingen emner med dette emneordet.", - "no-tags-found": "No tags found", + "no-tags-found": "Ingen emneord funnet", "tags": "Emneord", "enter-tags-here": "Skriv emneord her, mellom %1 og %2 tegn hver.", "enter-tags-here-short": "Skriv emneord...", "no-tags": "Det finnes ingen emneord enda.", "select-tags": "Velg kode", - "tag-whitelist": "Tag Whitelist", - "watching": "Watching", - "not-watching": "Not Watching", - "watching.description": "Notify me of new topics.", - "not-watching.description": "Do not notify me of new topics.", - "following-tag.message": "You will now be receiving notifications when somebody posts a topic with this tag.", - "not-following-tag.message": "You will not receive notifications when somebody posts a topic with this tag." + "tag-whitelist": "Hviteliste for emneord", + "watching": "Overvåker", + "not-watching": "Overvåker ikke", + "watching.description": "Gi meg beskjed om nye emner.", + "not-watching.description": "Ikke gi meg beskjed om nye emner.", + "following-tag.message": "Du vil nå motta varsler når noen legger ut et emne med denne taggen.", + "not-following-tag.message": "Du vil ikke motta varsler når noen legger ut et emne med denne taggen." } \ No newline at end of file diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json index 643a254e28..c7f2439908 100644 --- a/public/language/nb/topic.json +++ b/public/language/nb/topic.json @@ -36,7 +36,7 @@ "scheduled": "Planlagt", "moved": "Flyttet", "moved-from": "Flyttet fra %1", - "copy-code": "Copy Code", + "copy-code": "Kopier kode", "copy-ip": "Kopier IP", "ban-ip": "Forby IP", "view-history": "Redigere historie", @@ -45,25 +45,25 @@ "replied-to-user-ago": "svarte på %3 ", "replied-to-user-on": "svarte på %3 på ", "user-locked-topic-ago": "%1 låste dette emnet %2", - "user-locked-topic-on": "%1 locked this topic on %2", - "user-unlocked-topic-ago": "%1 unlocked this topic %2", - "user-unlocked-topic-on": "%1 unlocked this topic on %2", - "user-pinned-topic-ago": "%1 pinned this topic %2", - "user-pinned-topic-on": "%1 pinned this topic on %2", - "user-unpinned-topic-ago": "%1 unpinned this topic %2", - "user-unpinned-topic-on": "%1 unpinned this topic on %2", - "user-deleted-topic-ago": "%1 deleted this topic %2", - "user-deleted-topic-on": "%1 deleted this topic on %2", - "user-restored-topic-ago": "%1 restored this topic %2", - "user-restored-topic-on": "%1 restored this topic on %2", - "user-moved-topic-from-ago": "%1 moved this topic from %2 %3", - "user-moved-topic-from-on": "%1 moved this topic from %2 on %3", - "user-queued-post-ago": "%1 queued post for approval %3", - "user-queued-post-on": "%1 queued post for approval on %3", - "user-referenced-topic-ago": "%1 referenced this topic %3", - "user-referenced-topic-on": "%1 referenced this topic on %3", - "user-forked-topic-ago": "%1 forked this topic %3", - "user-forked-topic-on": "%1 forked this topic on %3", + "user-locked-topic-on": "%1 låste dette emnet på %2", + "user-unlocked-topic-ago": "%1 gjenåpnet dette emnet %2", + "user-unlocked-topic-on": "%1 gjenåpnet dette emnet på %2", + "user-pinned-topic-ago": "%1 festet dette emnet %2", + "user-pinned-topic-on": "%1 festet dette emnet på %2", + "user-unpinned-topic-ago": "%1 løsnet dette emnet %2", + "user-unpinned-topic-on": "%1 løsnet emnet på %2", + "user-deleted-topic-ago": "%1 slett dette emnet %2", + "user-deleted-topic-on": "%1 slett dette emnet på %2", + "user-restored-topic-ago": "%1 gjenopprettet dette emnet %2", + "user-restored-topic-on": "%1 gjenopprettet dette menet på %2", + "user-moved-topic-from-ago": "%1 flyttet dette emnet fra %2 %3", + "user-moved-topic-from-on": "%1 flyttet dette emnet fra %2 på %3", + "user-queued-post-ago": "%1 i kø post til godkjenning %3", + "user-queued-post-on": "%1 i køpost til godkjenning %3", + "user-referenced-topic-ago": "%1 refererte dette emnet %3", + "user-referenced-topic-on": "%1 refererte dette emnet dette emnet på %3", + "user-forked-topic-ago": "%1 gaflet dette emnet %3", + "user-forked-topic-on": "%1 gaflet dette emnet på %3", "bookmark-instructions": "Klikk her for å gå tilbake til det siste innlegget i denne tråden.", "flag-post": "Flagg denne posten", "flag-user": "Flagg denne brukeren", @@ -132,7 +132,7 @@ "bookmarks.has-no-bookmarks": "Du har ikke bokmerket noen innlegg ennå.", "copy-permalink": "Kopier permalink", "loading-more-posts": "Laster flere innlegg", - "move-topic": "Flytt tård", + "move-topic": "Flytt tråd", "move-topics": "Flytt tråder", "move-post": "Flytt innlegg", "post-moved": "Innlegg flyttet!", @@ -153,7 +153,7 @@ "merge-new-title-for-topic": "Ny tittel for emne", "topic-id": "Emne ID", "move-posts-instruction": "Klikk på innleggene du vil flytte, og skriv deretter inn en emne-ID, eller gå til målemnet", - "move-topic-instruction": "Select the target category and then click move", + "move-topic-instruction": "Velg målkategorien og klikk deretter flytt", "change-owner-instruction": "Klikk på innleggene du vil tildele til en annen bruker", "composer.title-placeholder": "Skriv din tråd-tittel her", "composer.handle-placeholder": "Skriv inn navnet ditt / signatur her", @@ -161,11 +161,11 @@ "composer.discard": "Forkast", "composer.submit": "Send", "composer.additional-options": "Ytterligere alternativer", - "composer.post-later": "Post Later", + "composer.post-later": "Publiser senere", "composer.schedule": "Timeplan", "composer.replying-to": "Svarer i %1", "composer.new-topic": "Ny tråd", - "composer.editing-in": "Editing post in %1", + "composer.editing-in": "Redigerer post i %1", "composer.uploading": "laster opp...", "composer.thumb-url-label": "Lim inn som tråd-minatyr URL", "composer.thumb-title": "Legg til minatyr til denne tråden", diff --git a/public/language/nb/user.json b/public/language/nb/user.json index f5a33e9593..196e4ca1d8 100644 --- a/public/language/nb/user.json +++ b/public/language/nb/user.json @@ -206,5 +206,5 @@ "emailUpdate.required": "Dette feltet er obligatorisk", "emailUpdate.change-instructions": "En bekreftelses-e-post med en unik lenke vil bli sendt til den angitte e-postadressen. Ved å klikke på lenken, vil du bekrefte at du eier e-postadressen, og den blir aktiv på kontoen din. Du kan når som helst oppdatere e-postadressen på brukerprofilen din.", "emailUpdate.password-challenge": "Skriv inn passordet ditt for å verifisere eierskap.", - "emailUpdate.pending": "Your email address has not yet been confirmed, but an email has been sent out requesting confirmation. If you wish to invalidate that request and send a new confirmation request, please fill in the form below." + "emailUpdate.pending": "E-postadressen din er ennå ikke bekreftet, men det er sendt ut en e-post med forespørsel om bekreftelse. Hvis du ønsker å ugyldiggjøre forespørselen og sende en ny bekreftelsesforespørsel, fyll ut skjemaet nedenfor." } \ No newline at end of file diff --git a/public/language/nl/admin/dashboard.json b/public/language/nl/admin/dashboard.json index c68cfa7079..63bae0694f 100644 --- a/public/language/nl/admin/dashboard.json +++ b/public/language/nl/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/pl/admin/dashboard.json b/public/language/pl/admin/dashboard.json index 6a635b8d08..e69b8fea39 100644 --- a/public/language/pl/admin/dashboard.json +++ b/public/language/pl/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/pt-BR/admin/dashboard.json b/public/language/pt-BR/admin/dashboard.json index 5f67dcddcc..49dd02ba69 100644 --- a/public/language/pt-BR/admin/dashboard.json +++ b/public/language/pt-BR/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/pt-PT/admin/dashboard.json b/public/language/pt-PT/admin/dashboard.json index 5b97161633..6f82ecb7e2 100644 --- a/public/language/pt-PT/admin/dashboard.json +++ b/public/language/pt-PT/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/ro/admin/dashboard.json b/public/language/ro/admin/dashboard.json index 681c202f47..6ad973f5f3 100644 --- a/public/language/ro/admin/dashboard.json +++ b/public/language/ro/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/ru/admin/dashboard.json b/public/language/ru/admin/dashboard.json index 232816875c..137241c469 100644 --- a/public/language/ru/admin/dashboard.json +++ b/public/language/ru/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/rw/admin/dashboard.json b/public/language/rw/admin/dashboard.json index 681c202f47..6ad973f5f3 100644 --- a/public/language/rw/admin/dashboard.json +++ b/public/language/rw/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/sc/admin/dashboard.json b/public/language/sc/admin/dashboard.json index 681c202f47..6ad973f5f3 100644 --- a/public/language/sc/admin/dashboard.json +++ b/public/language/sc/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/sk/admin/dashboard.json b/public/language/sk/admin/dashboard.json index d30f11dbc7..e979c81301 100644 --- a/public/language/sk/admin/dashboard.json +++ b/public/language/sk/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/sl/admin/dashboard.json b/public/language/sl/admin/dashboard.json index 0e64701cd0..7d36506d8f 100644 --- a/public/language/sl/admin/dashboard.json +++ b/public/language/sl/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/sq-AL/admin/dashboard.json b/public/language/sq-AL/admin/dashboard.json index 681c202f47..6ad973f5f3 100644 --- a/public/language/sq-AL/admin/dashboard.json +++ b/public/language/sq-AL/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/sr/admin/dashboard.json b/public/language/sr/admin/dashboard.json index 681c202f47..6ad973f5f3 100644 --- a/public/language/sr/admin/dashboard.json +++ b/public/language/sr/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/sv/admin/dashboard.json b/public/language/sv/admin/dashboard.json index 681c202f47..6ad973f5f3 100644 --- a/public/language/sv/admin/dashboard.json +++ b/public/language/sv/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/th/admin/dashboard.json b/public/language/th/admin/dashboard.json index 681c202f47..6ad973f5f3 100644 --- a/public/language/th/admin/dashboard.json +++ b/public/language/th/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/tr/admin/dashboard.json b/public/language/tr/admin/dashboard.json index a08b3a6082..391195d94c 100644 --- a/public/language/tr/admin/dashboard.json +++ b/public/language/tr/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/uk/admin/dashboard.json b/public/language/uk/admin/dashboard.json index b230979fca..6f8ce9fa8a 100644 --- a/public/language/uk/admin/dashboard.json +++ b/public/language/uk/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/vi/admin/dashboard.json b/public/language/vi/admin/dashboard.json index f67c00cde6..78ed4ec60d 100644 --- a/public/language/vi/admin/dashboard.json +++ b/public/language/vi/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "Xem dưới dạng JSON", "expand-analytics": "Mở rộng phân tích", "clear-search-history": "Xóa lịch sử tìm kiếm", - "clear-search-history-confirm": "Bạn có chắc chắn muốn xóa toàn bộ lịch sử tìm kiếm không?" + "clear-search-history-confirm": "Bạn có chắc chắn muốn xóa toàn bộ lịch sử tìm kiếm không?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/zh-CN/admin/dashboard.json b/public/language/zh-CN/admin/dashboard.json index 4d16469c1c..69b1f33da5 100644 --- a/public/language/zh-CN/admin/dashboard.json +++ b/public/language/zh-CN/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "以JSON格式查看", "expand-analytics": "展开统计数据", "clear-search-history": "清空搜索历史", - "clear-search-history-confirm": "您确定您要删除搜索历史吗？" + "clear-search-history-confirm": "您确定您要删除搜索历史吗？", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/language/zh-TW/admin/dashboard.json b/public/language/zh-TW/admin/dashboard.json index 0f7a66ab6d..6f2ea73022 100644 --- a/public/language/zh-TW/admin/dashboard.json +++ b/public/language/zh-TW/admin/dashboard.json @@ -94,5 +94,8 @@ "view-as-json": "View as JSON", "expand-analytics": "Expand analytics", "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?" + "clear-search-history-confirm": "Are you sure you want to clear entire search history?", + "search-term": "Term", + "search-count": "Count", + "view-all": "View all" } diff --git a/public/src/admin/dashboard.js b/public/src/admin/dashboard.js index 9ec8db599a..138df28300 100644 --- a/public/src/admin/dashboard.js +++ b/public/src/admin/dashboard.js @@ -90,28 +90,14 @@ function updateRoomUsage(err, data) { graphData.rooms = data; - const html = '
' + - '' + formattedNumber(data.onlineRegisteredCount) + '' + - '
[[admin/dashboard:active-users.users]]
' + - '
' + - '
' + - '' + formattedNumber(data.onlineGuestCount) + '' + - '
[[admin/dashboard:active-users.guests]]
' + - '
' + - '
' + - '' + formattedNumber(data.onlineRegisteredCount + data.onlineGuestCount) + '' + - '
[[admin/dashboard:active-users.total]]
' + - '
' + - '
' + - '' + formattedNumber(data.socketCount) + '' + - '
[[admin/dashboard:active-users.connections]]
' + - '
'; - updateRegisteredGraph(data.onlineRegisteredCount, data.onlineGuestCount); updatePresenceGraph(data.users); updateTopicsGraph(data.topTenTopics); - $('#active-users').translateHtml(html); + $('#active-users-loggedin').text(formattedNumber(data.onlineRegisteredCount)); + $('#active-users-guests').text(formattedNumber(data.onlineGuestCount)); + $('#active-users-total').text(formattedNumber(data.onlineRegisteredCount + data.onlineGuestCount)); + $('#active-users-connections').text(formattedNumber(data.socketCount)); } const graphs = { diff --git a/src/views/admin/dashboard.tpl b/src/views/admin/dashboard.tpl index d1189e66e2..355aedaba3 100644 --- a/src/views/admin/dashboard.tpl +++ b/src/views/admin/dashboard.tpl @@ -112,18 +112,44 @@
[[admin/dashboard:active-users]]
-
+
+ + + + + + + + + + + + + + + + + + + +
[[admin/dashboard:active-users.users]]
[[admin/dashboard:active-users.guests]]
[[admin/dashboard:active-users.total]]
[[admin/dashboard:active-users.connections]]
+
-
[[admin/dashboard:popular-searches]]
+
[[admin/dashboard:popular-searches]] [[admin/dashboard:view-all]]
- + + + {{{ each popularSearches }}} + + + + + {{{ end }}} + +
{popularSearches.value}{formattedNumber(popularSearches.score)}
diff --git a/src/views/admin/dashboard/searches.tpl b/src/views/admin/dashboard/searches.tpl index c669c4eda4..97c02cc863 100644 --- a/src/views/admin/dashboard/searches.tpl +++ b/src/views/admin/dashboard/searches.tpl @@ -1,5 +1,5 @@
-
+
@@ -19,8 +19,8 @@ - - + + {{{ if !searches.length}}} @@ -30,8 +30,8 @@ {{{ end }}} {{{ each searches }}} - - + + {{{ end }}}
CountTerm[[admin/dashboard:search-term]][[admin/dashboard:search-count]]
{searches.score}{searches.value}{searches.value}{formattedNumber(searches.score)}