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

.codeclimate.yml

@@ -17,6 +17,14 @@ checks:
   similar-code:
     config:
       threshold: 65
+plugins:
+  duplication:
+    enabled: true
+    config:
+      languages:
+        javascript:
+          mass_threshold: 110
+          count_threshold: 3
 exclude_paths:
 - "public/vendor/*"
 - "test/*"

public/language/he/admin/extend/rewards.json

@@ -1,10 +1,10 @@
 {
 	"rewards": "תגמולים",
 	"condition-if-users": "אם משתמש",
-	"condition-is": "Is:",
+	"condition-is": "לערך:",
 	"condition-then": "תגמל ב:",
 	"max-claims": "מספר פעמים בה ניתן לדרוש תגמול",
-	"zero-infinite": "הזן 0 לאינסוף",
+	"zero-infinite": "הזן 0 ללא הגבלה",
 	"delete": "מחק",
 	"enable": "הפעל",
 	"disable": "השבת",

public/language/he/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "כללי",
 	"settings/homepage": "דף הבית",
 	"settings/navigation": "ניווט",
-	"settings/reputation": "מוניטין ודיווחים",
+	"settings/reputation": "דיווחים ומוניטין",
 	"settings/email": "דוא\"ל",
 	"settings/user": "משתמשים",
 	"settings/group": "קבוצות",
@@ -27,7 +27,7 @@
 	"settings/uploads": "העלאות",
 	"settings/languages": "שפות",
 	"settings/post": "פוסטים",
-	"settings/chat": "צ'אטים",
+	"settings/chat": "צ'אט",
 	"settings/pagination": "עמודים",
 	"settings/tags": "תגיות",
 	"settings/notifications": "התראות",