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

public/language/ar/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/bg/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Настройка за подредбата на публикациите, %1",
 	"topic-sort-option": "Настройка за подредбата на темите, %1",
-	"user-avatar-for": "Изображение на потребителя за %1"
+	"user-avatar-for": "Изображение на потребителя за %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/bn/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/cs/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/da/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/de/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/el/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/en-US/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

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

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/es/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/et/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/fa-IR/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/fi/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/fr/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/gl/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/he/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "אפשרות מיון פוסטים, %1",
 	"topic-sort-option": "אפשרות מיון נושאים, %1",
-	"user-avatar-for": "סמליל משתמש עבור %1"
+	"user-avatar-for": "סמליל משתמש עבור %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/hr/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/hu/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/hy/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/id/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/it/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Opzione ordinamento post, %1",
 	"topic-sort-option": "Opzione ordinamento discussione, %1",
-	"user-avatar-for": "Avatar utente per %1"
+	"user-avatar-for": "Avatar utente per %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/ja/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/ko/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "게시물 정렬 옵션, %1",
 	"topic-sort-option": "토픽 정렬 옵션, %1",
-	"user-avatar-for": "%1 유저 아바타"
+	"user-avatar-for": "%1 유저 아바타",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/lt/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/lv/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/ms/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/nb/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/nl/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/pl/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Opcja sortowania postów, %1",
 	"topic-sort-option": "Opcja sortowania tematów, %1",
-	"user-avatar-for": "Awatar dla %1"
+	"user-avatar-for": "Awatar dla %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/pt-BR/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/pt-PT/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/ro/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/ru/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/rw/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/sc/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/sk/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/sl/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/sq-AL/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/sr/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/sv/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/th/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/tr/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/uk/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/vi/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/zh-CN/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }

public/language/zh-TW/aria.json

@@ -1,5 +1,7 @@
 {
 	"post-sort-option": "Post sort option, %1",
 	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1"
+	"user-avatar-for": "User avatar for %1",
+	"user-watched-tags": "User watched tags",
+	"delete-upload-button": "Delete upload button"
 }