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

public/language/ar/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "تم سجيل الدخول بنجاح",
     "save_changes": "حفظ التغييرات",
     "save": "حفظ",
+    "cancel": "Cancel",
     "close": "أغلق",
     "pagination": "الصفحات",
     "pagination.out_of": "%1 من %2",

public/language/bg/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Вие влязохте успешно",
     "save_changes": "Запазване на промените",
     "save": "Запазване",
+    "cancel": "Cancel",
     "close": "Затваряне",
     "pagination": "Странициране",
     "pagination.out_of": "%1 от %2",

public/language/bn/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "আপনি সফলভাবে প্রবেশ করেছেন",
     "save_changes": "পরিবর্তনগুলি সঞ্চয় করুন",
     "save": "Save",
+    "cancel": "Cancel",
     "close": "বন্ধ",
     "pagination": "পাতা নং",
     "pagination.out_of": "%2 এর মাঝে %1",

public/language/cs/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Vaše přihlášení proběhlo úspěšně",
     "save_changes": "Uložit změny",
     "save": "Uložit",
+    "cancel": "Cancel",
     "close": "Zrušit",
     "pagination": "Stránkování",
     "pagination.out_of": "%1 z %2",

public/language/da/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Du er nu logget ind",
     "save_changes": "Gem ændringer",
     "save": "Save",
+    "cancel": "Cancel",
     "close": "Luk",
     "pagination": "Sidetal",
     "pagination.out_of": "%1 ud af %2",

public/language/de/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Du hast dich erfolgreich angemeldet",
     "save_changes": "Änderungen speichern",
     "save": "Speichern",
+    "cancel": "Cancel",
     "close": "Schließen",
     "pagination": "Seitennummerierung",
     "pagination.out_of": "%1 von %2",

public/language/el/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Συνδέθηκες με επιτυχία",
     "save_changes": "Αποθήκευση Αλλαγών",
     "save": "Αποθήκευση",
+    "cancel": "Cancel",
     "close": "Κλείσιμο",
     "pagination": "Σελιδοποίηση",
     "pagination.out_of": "%1 από %2",

public/language/en-US/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "You have successfully logged in",
     "save_changes": "Save Changes",
     "save": "Save",
+    "cancel": "Cancel",
     "close": "Close",
     "pagination": "Pagination",
     "pagination.out_of": "%1 out of %2",

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

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Ye have successfully logged in",
     "save_changes": "Save yer Changes",
     "save": "Save",
+    "cancel": "Cancel",
     "close": "Shoot down",
     "pagination": "Pagination",
     "pagination.out_of": "%1 out of %2",

public/language/es/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Identificado satisfactoriamente",
     "save_changes": "Guardar cambios",
     "save": "Guardar",
+    "cancel": "Cancel",
     "close": "Cerrar",
     "pagination": "Paginación",
     "pagination.out_of": "%1 de %2",

public/language/et/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Edukalt sisse logitud",
     "save_changes": "Salvesta muudatused",
     "save": "Save",
+    "cancel": "Cancel",
     "close": "Sulge",
     "pagination": "Lehekülgede numeratsioon",
     "pagination.out_of": "%1 kõigist %2-st",

public/language/fa-IR/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "با موفقیت درون آمده‌اید",
     "save_changes": "اندوختن تغییرها",
     "save": "ذخیره",
+    "cancel": "Cancel",
     "close": "بستن",
     "pagination": "صفحه‌بندی",
     "pagination.out_of": "%1 از %2",

public/language/fi/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Olet onnistuneesti kirjautunut sisään",
     "save_changes": "Tallenna muutokset",
     "save": "Tallenna",
+    "cancel": "Cancel",
     "close": "Sulje",
     "pagination": "Sivutus",
     "pagination.out_of": "%1/%2",

public/language/fr/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Vous vous êtes bien connecté",
     "save_changes": "Enregistrer les changements",
     "save": "Enregistrer",
+    "cancel": "Cancel",
     "close": "Fermer",
     "pagination": "Pagination",
     "pagination.out_of": "%1 sur %2",

public/language/gl/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Sentidiño!",
     "save_changes": "Gardar Cambios",
     "save": "Gardar",
+    "cancel": "Cancel",
     "close": "Pechar ",
     "pagination": "Paxinación",
     "pagination.out_of": "%1 de %2",

public/language/he/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "התחברתם בהצלחה",
     "save_changes": "שמור שינויים",
     "save": "שמור",
+    "cancel": "Cancel",
     "close": "סגור",
     "pagination": "הגדרות עמוד",
     "pagination.out_of": "%1 מתוך %2",

public/language/hr/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Uspješno ste se prijavili",
     "save_changes": "Spremi promjene",
     "save": "Spremi",
+    "cancel": "Cancel",
     "close": "Zatvori",
     "pagination": "Stranice",
     "pagination.out_of": "%1 od %2",

public/language/hu/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Sikeresen beléptél",
     "save_changes": "Változások mentése",
     "save": "Mentés",
+    "cancel": "Cancel",
     "close": "Bezárás",
     "pagination": "Lapozás",
     "pagination.out_of": "%1 / %2",

public/language/hy/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Դուք հաջողությամբ մուտք գործեցիք",
     "save_changes": "Պահպանել փոփոխությունները",
     "save": "Պահպանել",
+    "cancel": "Cancel",
     "close": "Փակել",
     "pagination": "Էջադրում",
     "pagination.out_of": "%1 %2-ից",

public/language/id/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Kamu sudah login",
     "save_changes": "Menyimpan perubahan",
     "save": "Save",
+    "cancel": "Cancel",
     "close": "Tutup",
     "pagination": "Halaman",
     "pagination.out_of": "%1 dari %2",

public/language/it/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Accesso effettuato con successo",
     "save_changes": "Salva Modifiche",
     "save": "Salva",
+    "cancel": "Cancel",
     "close": "Chiudi",
     "pagination": "Impaginazione",
     "pagination.out_of": "%1 di %2",
@@ -60,7 +61,7 @@
     "posts": "Post",
     "x-posts": "<span class=\"formatted-number\">%1</span> post",
     "x-topics": "<span class=\"formatted-number\">%1</span> discussioni",
-    "x-reputation": "<span class=\"formatted-number\">%1</span> reputation",
+    "x-reputation": "<span class=\"formatted-number\">%1</span> reputazione",
     "best": "Migliore",
     "controversial": "Controverso",
     "votes": "Votazioni",
@@ -134,5 +135,5 @@
     "user-search-prompt": "Scrivi qui per avviare la ricerca utenti",
     "hidden": "Nascosto",
     "sort": "Ordinamento",
-    "actions": "Actions"
+    "actions": "Azioni"
 }

public/language/ja/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "ログインできました",
     "save_changes": "保存する",
     "save": "保存",
+    "cancel": "Cancel",
     "close": "閉じる",
     "pagination": "ページ",
     "pagination.out_of": "%2件中%1件目",

public/language/ko/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "성공적으로 로그인했습니다.",
     "save_changes": "변경사항 저장",
     "save": "저장",
+    "cancel": "Cancel",
     "close": "닫기",
     "pagination": "페이지",
     "pagination.out_of": "현재: %1 / 전체: %2",

public/language/lt/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Jūs sėkmingai prisijungėte",
     "save_changes": "Išsaugoti pakeitimus",
     "save": "Save",
+    "cancel": "Cancel",
     "close": "Uždaryti",
     "pagination": "Numeracija",
     "pagination.out_of": "%1 iš %2",

public/language/lv/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Tu esi veiksmīgi ielogojies",
     "save_changes": "Saglabāt izmaiņas",
     "save": "Saglabāt",
+    "cancel": "Cancel",
     "close": "Aizvērt",
     "pagination": "Dalīšana pa lapām",
     "pagination.out_of": "%1 no %2",

public/language/ms/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Anda telah berjaya log masuk",
     "save_changes": "Simpan perubahan",
     "save": "Save",
+    "cancel": "Cancel",
     "close": "Tutup",
     "pagination": "Mukasurat",
     "pagination.out_of": "%1 daripada %2",

public/language/nb/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Du har blitt logget inn",
     "save_changes": "Lagre endringer",
     "save": "Lagre",
+    "cancel": "Cancel",
     "close": "Lukk",
     "pagination": "Paginering",
     "pagination.out_of": "%1 ut av %2",

public/language/nl/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Aanmelden succesvol",
     "save_changes": "Wijzigingen opslaan",
     "save": "Opslaan",
+    "cancel": "Cancel",
     "close": "Sluiten",
     "pagination": "Paginering",
     "pagination.out_of": "%1 van %2",

public/language/pl/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Logowanie powiodło się.",
     "save_changes": "Zapisz zmiany",
     "save": "Zapisz",
+    "cancel": "Cancel",
     "close": "Zamknij",
     "pagination": "Numerowanie stron",
     "pagination.out_of": "%1 z %2",

public/language/pt-BR/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Você logou com sucesso",
     "save_changes": "Salvar Alterações",
     "save": "Salvar",
+    "cancel": "Cancel",
     "close": "Fechar",
     "pagination": "Paginação",
     "pagination.out_of": "%1 de %2",

public/language/pt-PT/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Iniciaste sessão com sucesso",
     "save_changes": "Guardar as alterações",
     "save": "Guardar",
+    "cancel": "Cancel",
     "close": "Fechar",
     "pagination": "Paginação",
     "pagination.out_of": "%1 de %2",

public/language/ro/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Te-ai conectat cu succes",
     "save_changes": "Salvează Modificări",
     "save": "Save",
+    "cancel": "Cancel",
     "close": "Închide",
     "pagination": "Paginație",
     "pagination.out_of": "%1 din %2",

public/language/ru/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Вы успешно вошли на форум",
     "save_changes": "Сохранить изменения",
     "save": "Сохранить",
+    "cancel": "Cancel",
     "close": "Закрыть",
     "pagination": "Разбивка на страницы",
     "pagination.out_of": "%1 из %2",

public/language/rw/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Winjiyemo nta ngorane",
     "save_changes": "Bika ibyamaze gukorwa",
     "save": "Save",
+    "cancel": "Cancel",
     "close": "Funga",
     "pagination": "Umubare wa Paji",
     "pagination.out_of": "%1 muri %2",

public/language/sc/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Ses intradu",
     "save_changes": "Alloga Acontzos",
     "save": "Save",
+    "cancel": "Cancel",
     "close": "Serra",
     "pagination": "Paginatzione",
     "pagination.out_of": "%1 out of %2",

public/language/sk/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Úspešne ste sa prihlásili",
     "save_changes": "Uložiť zmeny",
     "save": "Uložiť",
+    "cancel": "Cancel",
     "close": "Zatvoriť",
     "pagination": "Stránkovanie",
     "pagination.out_of": "%1 z %2",

public/language/sl/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Uspešno ste se prijavili.",
     "save_changes": "Shrani spremembe.",
     "save": "Shrani",
+    "cancel": "Cancel",
     "close": "Zapri",
     "pagination": "Oštevilčenje strani",
     "pagination.out_of": "%1 od %2",

public/language/sq-AL/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Ju keni hyrë me sukses",
     "save_changes": "Ruaj ndryshimet",
     "save": "Ruaj",
+    "cancel": "Cancel",
     "close": "Mbyll",
     "pagination": "Numërim Faqesh",
     "pagination.out_of": "%1 nga %2",

public/language/sr/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Успешно сте се пријавили",
     "save_changes": "Сачувај измене",
     "save": "Сачувај",
+    "cancel": "Cancel",
     "close": "Затвори",
     "pagination": "Нумерисање страница",
     "pagination.out_of": "%1 од %2",
@@ -60,7 +61,7 @@
     "posts": "Поруке",
     "x-posts": "<span class=\"formatted-number\">%1</span> поруке",
     "x-topics": "<span class=\"formatted-number\">%1</span> теме",
-    "x-reputation": "<span class=\"formatted-number\">%1</span> reputation",
+    "x-reputation": "<span class=\"formatted-number\">%1</span> угледа",
     "best": "Најбоље",
     "controversial": "Спорно",
     "votes": "Гласови",
@@ -134,5 +135,5 @@
     "user-search-prompt": "Uкуцајте нешто овде како бисте пронашли кориснике...",
     "hidden": "Сакривен",
     "sort": "Сортирај",
-    "actions": "Actions"
+    "actions": "Радње"
 }

public/language/sv/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Inloggningen lyckades",
     "save_changes": "Spara ändringar",
     "save": "Spara",
+    "cancel": "Cancel",
     "close": "Stäng",
     "pagination": "Siduppdelning",
     "pagination.out_of": "%1 av %2",

public/language/th/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "คุณได้เข้าสู่ระบบแล้ว",
     "save_changes": "บันทึกการเปลี่ยนแปลง",
     "save": "บันทึก",
+    "cancel": "Cancel",
     "close": "ปิด",
     "pagination": "การแบ่งหน้า",
     "pagination.out_of": "%1 จาก %2",

public/language/tr/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Başarıyla giriş yaptınız!",
     "save_changes": "Değişiklikleri Kaydet",
     "save": "Kaydet",
+    "cancel": "Cancel",
     "close": "Kapat",
     "pagination": "Sayfalara numara koyma",
     "pagination.out_of": "%1 - %2",

public/language/uk/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Ви успішно увійшли",
     "save_changes": "Зберегти зміни",
     "save": "Зберегти",
+    "cancel": "Cancel",
     "close": "Закрити",
     "pagination": "Розбиття на сторінки",
     "pagination.out_of": "%1 із %2",

public/language/vi/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "Bạn đã đăng nhập thành công",
     "save_changes": "Lưu thay đổi",
     "save": "Lưu",
+    "cancel": "Cancel",
     "close": "Đóng",
     "pagination": "Phân trang",
     "pagination.out_of": "%1 trong số %2",

public/language/zh-CN/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "您已成功登录",
     "save_changes": "保存更改",
     "save": "保存",
+    "cancel": "Cancel",
     "close": "关闭",
     "pagination": "分页",
     "pagination.out_of": "%1 / %2",

public/language/zh-TW/global.json

@@ -20,6 +20,7 @@
     "you_have_successfully_logged_in": "您已成功登入",
     "save_changes": "儲存更改",
     "save": "儲存",
+    "cancel": "Cancel",
     "close": "關閉",
     "pagination": "分頁",
     "pagination.out_of": "%1 / %2",