Merge branch 'master' of https://github.com/NodeBB/NodeBB

install/package.json

@@ -103,9 +103,9 @@
         "nodebb-plugin-spam-be-gone": "0.7.6",
         "nodebb-rewards-essentials": "0.1.4",
         "nodebb-theme-lavender": "5.0.14",
-        "nodebb-theme-persona": "10.2.88",
+        "nodebb-theme-persona": "10.2.90",
         "nodebb-theme-slick": "1.3.3",
-        "nodebb-theme-vanilla": "11.3.4",
+        "nodebb-theme-vanilla": "11.3.5",
         "nodebb-widget-essentials": "4.1.2",
         "nodemailer": "^6.4.6",
         "nprogress": "0.2.0",

public/language/ar/topic.json

@@ -29,6 +29,7 @@
     "tools": "أدوات",
     "locked": "مقفل",
     "pinned": "مثبت",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "منقول",
     "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",

public/language/bg/topic.json

@@ -29,6 +29,7 @@
     "tools": "Инструменти",
     "locked": "Заключена",
     "pinned": "Закачена",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Преместена",
     "moved-from": "Преместена от %1",
     "copy-ip": "Копиране на IP адреса",

public/language/bn/topic.json

@@ -29,6 +29,7 @@
     "tools": "টুলস",
     "locked": "বন্ধ",
     "pinned": "Pinned",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",

public/language/cs/topic.json

@@ -29,6 +29,7 @@
     "tools": "Nástroje",
     "locked": "Uzamknuto",
     "pinned": "Připnuto",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Přesunuto",
     "moved-from": "Moved from %1",
     "copy-ip": "Kopírovat IP",

public/language/da/topic.json

@@ -29,6 +29,7 @@
     "tools": "Værktøjer",
     "locked": "Låst",
     "pinned": "Pinned",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Flyttet",
     "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",

public/language/de/topic.json

@@ -29,6 +29,7 @@
     "tools": "Werkzeuge",
     "locked": "Gesperrt",
     "pinned": "Angeheftet",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Verschoben",
     "moved-from": "Moved from %1",
     "copy-ip": "IP-Adresse Kopieren",

public/language/el/topic.json

@@ -29,6 +29,7 @@
     "tools": "Εργαλεία",
     "locked": "Κλειδωμένο",
     "pinned": "Pinned",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",

public/language/en-GB/topic.json

@@ -32,6 +32,7 @@
 	"tools": "Tools",
 	"locked": "Locked",
 	"pinned": "Pinned",
+	"pinned-with-expiry": "Pinned until %1",
 	"moved": "Moved",
 	"moved-from": "Moved from %1",
 	"copy-ip": "Copy IP",

public/language/en-US/topic.json

@@ -29,6 +29,7 @@
     "tools": "Tools",
     "locked": "Locked",
     "pinned": "Pinned",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",

public/language/en-x-pirate/topic.json

@@ -29,6 +29,7 @@
     "tools": "Tools",
     "locked": "Locked",
     "pinned": "Pinned",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",

public/language/es/topic.json

@@ -29,6 +29,7 @@
     "tools": "Herramientas",
     "locked": "Cerrado",
     "pinned": "Fijo",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Movido",
     "moved-from": "Moved from %1",
     "copy-ip": "Copiar IP",

public/language/et/topic.json

@@ -29,6 +29,7 @@
     "tools": "Tööriistad",
     "locked": "Lukustatud",
     "pinned": "Märgistatud",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Liigutatud",
     "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",

public/language/fa-IR/topic.json

@@ -29,6 +29,7 @@
     "tools": "ابزارها",
     "locked": "قفل شده است",
     "pinned": "سنجاق شده",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "منتقل شده",
     "moved-from": "Moved from %1",
     "copy-ip": "کپی IP",

public/language/fi/topic.json

@@ -29,6 +29,7 @@
     "tools": "Työkalut",
     "locked": "Lukittu",
     "pinned": "Kiinnitetty",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Siirretty",
     "moved-from": "Moved from %1",
     "copy-ip": "Kopioi IP",

public/language/fr/topic.json

@@ -29,6 +29,7 @@
     "tools": "Outils",
     "locked": "Verrouillé",
     "pinned": "Épinglé",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Déplacé",
     "moved-from": "Déplacé de %1",
     "copy-ip": "Copier l'IP",

public/language/gl/topic.json

@@ -29,6 +29,7 @@
     "tools": "Ferramentas",
     "locked": "Pechado",
     "pinned": "Fixo",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Movido",
     "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",

public/language/he/topic.json

@@ -29,6 +29,7 @@
     "tools": "כלים",
     "locked": "נעול",
     "pinned": "נעוץ",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "הועבר",
     "moved-from": "הועבר מ-%1",
     "copy-ip": "העתק IP",

public/language/hr/topic.json

@@ -29,6 +29,7 @@
     "tools": "Alati",
     "locked": "Zaključano",
     "pinned": "Zakačeno",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Premješteno",
     "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",

public/language/hu/topic.json

@@ -29,6 +29,7 @@
     "tools": "Eszközök",
     "locked": "Zárolva",
     "pinned": "Rögzített",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Áthelyezett",
     "moved-from": "Moved from %1",
     "copy-ip": "IP-cím másolása",

public/language/id/topic.json

@@ -29,6 +29,7 @@
     "tools": "Perangkat",
     "locked": "Terkunci",
     "pinned": "Pinned",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",

public/language/it/topic.json

@@ -29,6 +29,7 @@
     "tools": "Strumenti",
     "locked": "Bloccato",
     "pinned": "Appeso",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Spostato",
     "moved-from": "Spostato da %1",
     "copy-ip": "Copia indirizzo IP",

public/language/ja/topic.json

@@ -29,6 +29,7 @@
     "tools": "ツール",
     "locked": "ロック",
     "pinned": "ピンされた",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "移動しました",
     "moved-from": "Moved from %1",
     "copy-ip": "IPをコピー",

public/language/ko/topic.json

@@ -29,6 +29,7 @@
     "tools": "도구",
     "locked": "잠긴 게시물",
     "pinned": "고정된 게시물",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "이동된 게시물",
     "moved-from": "Moved from %1",
     "copy-ip": "IP 복사",

public/language/lt/topic.json

@@ -29,6 +29,7 @@
     "tools": "Įrankiai",
     "locked": "Užrakinta",
     "pinned": "Pinned",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Perkelta",
     "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",

public/language/lv/topic.json

@@ -29,6 +29,7 @@
     "tools": "Rīki",
     "locked": "Slēgtie",
     "pinned": "Piespraustie",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Pārvietots",
     "moved-from": "Moved from %1",
     "copy-ip": "Kopēt IP adresi",

public/language/ms/topic.json

@@ -29,6 +29,7 @@
     "tools": "Perkakas",
     "locked": "Kunci",
     "pinned": "Pinned",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",

public/language/nb/topic.json

@@ -29,6 +29,7 @@
     "tools": "Verktøy",
     "locked": "Låst",
     "pinned": "Pinned",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",

public/language/nl/topic.json

@@ -29,6 +29,7 @@
     "tools": "Extra",
     "locked": "Gesloten",
     "pinned": "Pinned",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Verplaatst",
     "moved-from": "Moved from %1",
     "copy-ip": "Kopieer IP",

public/language/pl/topic.json

@@ -29,6 +29,7 @@
     "tools": "Narzędzia",
     "locked": "Zablokowany",
     "pinned": "Przypięty",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Przeniesiony",
     "moved-from": "Moved from %1",
     "copy-ip": "Kopiuj IP",

public/language/pt-BR/topic.json

@@ -29,6 +29,7 @@
     "tools": "Ferramentas",
     "locked": "Trancado",
     "pinned": "Fixado",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Movido",
     "moved-from": "Moved from %1",
     "copy-ip": "Copiar IP",

public/language/pt-PT/topic.json

@@ -29,6 +29,7 @@
     "tools": "Ferramentas",
     "locked": "Bloqueado",
     "pinned": "Afixado",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Movido",
     "moved-from": "Moved from %1",
     "copy-ip": "Copiar IP",

public/language/ro/topic.json

@@ -29,6 +29,7 @@
     "tools": "Unelte",
     "locked": "Închis",
     "pinned": "Pinned",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",

public/language/ru/topic.json

@@ -29,6 +29,7 @@
     "tools": "Действия",
     "locked": "Закрыта",
     "pinned": "Прикреплена",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Перенесена",
     "moved-from": "Moved from %1",
     "copy-ip": "Копировать IP",

public/language/rw/topic.json

@@ -29,6 +29,7 @@
     "tools": "Ibikoresho",
     "locked": "Birafungiranye",
     "pinned": "Pinned",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",

public/language/sc/topic.json

@@ -29,6 +29,7 @@
     "tools": "Ainas",
     "locked": "Locked",
     "pinned": "Pinned",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",

public/language/sk/topic.json

@@ -29,6 +29,7 @@
     "tools": "Nástroje",
     "locked": "Uzamknuté",
     "pinned": "Pripnuté",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Presunuté",
     "moved-from": "Moved from %1",
     "copy-ip": "Kopírovať IP adresu",

public/language/sl/topic.json

@@ -29,6 +29,7 @@
     "tools": "Orodja",
     "locked": "Zaklenjeno",
     "pinned": "Pripeto",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Premaknjeno",
     "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",

public/language/sr/topic.json

@@ -29,6 +29,7 @@
     "tools": "Алатке",
     "locked": "Закључано",
     "pinned": "Закачено",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Премештено",
     "moved-from": "Moved from %1",
     "copy-ip": "Копирај IP",

public/language/sv/topic.json

@@ -29,6 +29,7 @@
     "tools": "Verktyg",
     "locked": "Låst",
     "pinned": "Fäst",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Flyttad",
     "moved-from": "Moved from %1",
     "copy-ip": "Kopiera IP",

public/language/th/topic.json

@@ -29,6 +29,7 @@
     "tools": "เครื่องมือ",
     "locked": "ถูกล็อก",
     "pinned": "ถูกปักหมุด",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "ถูกย้าย",
     "moved-from": "Moved from %1",
     "copy-ip": "คัดลอก IP",

public/language/tr/topic.json

@@ -29,6 +29,7 @@
     "tools": "Araçlar",
     "locked": "Kilitli",
     "pinned": "Sabitlendi",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Taşındı",
     "moved-from": "Şuradan taşındı: %1",
     "copy-ip": "IP Kopyala",

public/language/uk/topic.json

@@ -29,6 +29,7 @@
     "tools": "Інструменти",
     "locked": "Заблокована",
     "pinned": "Закріплена",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Переміщена",
     "moved-from": "Moved from %1",
     "copy-ip": "Копіювати IP",

public/language/vi/topic.json

@@ -29,6 +29,7 @@
     "tools": "Công cụ",
     "locked": "Khóa",
     "pinned": "Đã ghim",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "Chuyển đi",
     "moved-from": "Moved from %1",
     "copy-ip": "Sao chép IP",

public/language/zh-CN/topic.json

@@ -29,6 +29,7 @@
     "tools": "工具",
     "locked": "已锁定",
     "pinned": "已固定",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "已移动",
     "moved-from": "移自1%版 ",
     "copy-ip": "复制IP",

public/language/zh-TW/topic.json

@@ -29,6 +29,7 @@
     "tools": "工具",
     "locked": "已鎖定",
     "pinned": "已置頂",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "已移動",
     "moved-from": "Moved from %1",
     "copy-ip": "複製IP",