Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop

2 years ago · 3847ae44d9
parent 1fc658b3c0 58bdedaf8b
commit 3847ae44d9
46 changed files with 92 additions and 46 deletions
--- a/public/language/ar/admin/admin.json
+++ b/public/language/ar/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/bg/admin/admin.json
+++ b/public/language/bg/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Мин.:",
 	"max": "Макс.:",
 	"view": "Преглед",
-	"edit": "Редактиране"
+	"edit": "Редактиране",
+	"add": "Add"
 }
--- a/public/language/bn/admin/admin.json
+++ b/public/language/bn/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/cs/admin/admin.json
+++ b/public/language/cs/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/da/admin/admin.json
+++ b/public/language/da/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/de/admin/admin.json
+++ b/public/language/de/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/el/admin/admin.json
+++ b/public/language/el/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/en-US/admin/admin.json
+++ b/public/language/en-US/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/en-x-pirate/admin/admin.json
+++ b/public/language/en-x-pirate/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/es/admin/admin.json
+++ b/public/language/es/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/et/admin/admin.json
+++ b/public/language/et/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/fa-IR/admin/admin.json
+++ b/public/language/fa-IR/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/fi/admin/admin.json
+++ b/public/language/fi/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/fr/admin/admin.json
+++ b/public/language/fr/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "Voir",
-	"edit": "Éditer "
+	"edit": "Éditer ",
+	"add": "Add"
 }
--- a/public/language/gl/admin/admin.json
+++ b/public/language/gl/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/he/admin/admin.json
+++ b/public/language/he/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "מינימום:",
 	"max": "מקסימום:",
 	"view": "View",
-	"edit": "עריכה"
+	"edit": "עריכה",
+	"add": "Add"
 }
--- a/public/language/hr/admin/admin.json
+++ b/public/language/hr/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/hu/admin/admin.json
+++ b/public/language/hu/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/hy/admin/admin.json
+++ b/public/language/hy/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/id/admin/admin.json
+++ b/public/language/id/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/it/admin/admin.json
+++ b/public/language/it/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "Visualizza",
-	"edit": "Modifica"
+	"edit": "Modifica",
+	"add": "Add"
 }
--- a/public/language/ja/admin/admin.json
+++ b/public/language/ja/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/ko/admin/admin.json
+++ b/public/language/ko/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/lt/admin/admin.json
+++ b/public/language/lt/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/lv/admin/admin.json
+++ b/public/language/lv/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/ms/admin/admin.json
+++ b/public/language/ms/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/nb/admin/admin.json
+++ b/public/language/nb/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/nl/admin/admin.json
+++ b/public/language/nl/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/pl/admin/admin.json
+++ b/public/language/pl/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/pt-BR/admin/admin.json
+++ b/public/language/pt-BR/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/pt-PT/admin/admin.json
+++ b/public/language/pt-PT/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/ro/admin/admin.json
+++ b/public/language/ro/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/ru/admin/admin.json
+++ b/public/language/ru/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/rw/admin/admin.json
+++ b/public/language/rw/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/sc/admin/admin.json
+++ b/public/language/sc/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/sk/admin/admin.json
+++ b/public/language/sk/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/sl/admin/admin.json
+++ b/public/language/sl/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/sq-AL/admin/admin.json
+++ b/public/language/sq-AL/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/sr/admin/admin.json
+++ b/public/language/sr/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/sv/admin/admin.json
+++ b/public/language/sv/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/th/admin/admin.json
+++ b/public/language/th/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/tr/admin/admin.json
+++ b/public/language/tr/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/uk/admin/admin.json
+++ b/public/language/uk/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/vi/admin/admin.json
+++ b/public/language/vi/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }
--- a/public/language/zh-CN/admin/admin.json
+++ b/public/language/zh-CN/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "最小：",
 	"max": "最大：",
 	"view": "浏览",
-	"edit": "编辑"
+	"edit": "编辑",
+	"add": "Add"
 }
--- a/public/language/zh-TW/admin/admin.json
+++ b/public/language/zh-TW/admin/admin.json
@ -12,5 +12,6 @@
 	"min": "Min:",
 	"max": "Max:",
 	"view": "View",
-	"edit": "Edit"
+	"edit": "Edit",
+	"add": "Add"
 }