merged composer and some other files with master

v1.18.x
akhoury 11 years ago
commit 63c9269240

@ -70,13 +70,15 @@ if (nconf.get('config')) {
} }
configExists = fs.existsSync(configFile); configExists = fs.existsSync(configFile);
if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && configExists) { if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && !nconf.get('reset') && configExists) {
start(); start();
} else if (nconf.get('setup') || nconf.get('install') || !configExists) { } else if (nconf.get('setup') || nconf.get('install') || !configExists) {
setup(); setup();
} else if (nconf.get('upgrade')) { } else if (nconf.get('upgrade')) {
upgrade(); upgrade();
} else/* if (nconf.get('help') */{ } else if (nconf.get('reset')) {
reset();
} else {
displayHelp(); displayHelp();
}; };
@ -196,6 +198,46 @@ function upgrade() {
}); });
} }
function reset() {
nconf.file({
file: __dirname + '/config.json'
});
var meta = require('./src/meta'),
db = require('./src/database'),
async = require('async');
db.init(function(err) {
meta.configs.init(function () {
async.parallel([
function(next) {
db.delete('plugins:active', next);
},
function(next) {
meta.configs.set('theme:type', 'local', next);
},
function(next) {
meta.configs.set('theme:id', 'nodebb-theme-vanilla', next);
},
function(next) {
meta.configs.set('theme:staticDir', '', next);
},
function(next) {
meta.configs.set('theme:templates', '', next);
}
], function(err) {
if (err) {
winston.error(err);
} else {
winston.info("Successfully reset theme to Vanilla and disabled all plugins.");
}
process.exit();
});
});
});
}
function displayHelp() { function displayHelp() {
winston.info('Usage: node app [options] [arguments]'); winston.info('Usage: node app [options] [arguments]');
winston.info(' [NODE_ENV=development | NODE_ENV=production] node app [--start] [arguments]'); winston.info(' [NODE_ENV=development | NODE_ENV=production] node app [--start] [arguments]');
@ -204,5 +246,6 @@ function displayHelp() {
winston.info(' --help displays this usage information'); winston.info(' --help displays this usage information');
winston.info(' --setup configure your environment and setup NodeBB'); winston.info(' --setup configure your environment and setup NodeBB');
winston.info(' --upgrade upgrade NodeBB, first read: github.com/designcreateplay/NodeBB/wiki/Upgrading-NodeBB'); winston.info(' --upgrade upgrade NodeBB, first read: github.com/designcreateplay/NodeBB/wiki/Upgrading-NodeBB');
winston.info(' --reset soft resets NodeBB; disables all plugins and restores selected theme to Vanilla');
winston.info(' --start manually start NodeBB (default when no options are given)'); winston.info(' --start manually start NodeBB (default when no options are given)');
} }

@ -22,6 +22,10 @@ case "$1" in
node app --setup node app --setup
;; ;;
reset)
node app --reset
;;
dev) dev)
echo "Launching NodeBB in \"development\" mode." echo "Launching NodeBB in \"development\" mode."
echo "To run the production build of NodeBB, please use \"forever\"." echo "To run the production build of NodeBB, please use \"forever\"."
@ -55,7 +59,7 @@ case "$1" in
*) *)
echo "Welcome to NodeBB" echo "Welcome to NodeBB"
echo $"Usage: $0 {start|dev|watch|language}" echo $"Usage: $0 {start|dev|watch|upgrade}"
echo '' echo ''
column -s ' ' -t <<< ' column -s ' ' -t <<< '
start Start NodeBB in production mode start Start NodeBB in production mode

@ -36,7 +36,7 @@
"rss": "~0.2.0", "rss": "~0.2.0",
"prompt": "~0.2.11", "prompt": "~0.2.11",
"uglify-js": "~2.4.0", "uglify-js": "~2.4.0",
"validator": "~1.5.1", "validator": "~3.2.1",
"nodebb-plugin-mentions": "~0.4", "nodebb-plugin-mentions": "~0.4",
"nodebb-plugin-markdown": "~0.3", "nodebb-plugin-markdown": "~0.3",
"nodebb-theme-vanilla": "~0.0.13", "nodebb-theme-vanilla": "~0.0.13",

@ -10,11 +10,14 @@
"500.message": "عفوا! يبدو وكأنه شيء ذهب على نحو خاطئ!", "500.message": "عفوا! يبدو وكأنه شيء ذهب على نحو خاطئ!",
"register": "تسجيل", "register": "تسجيل",
"login": "دخول", "login": "دخول",
"welcome_back": "Welcome Back ",
"you_have_successfully_logged_in": "You have successfully logged in",
"logout": "تسجيل الخروج", "logout": "تسجيل الخروج",
"logout.title": "تم تسجيل الخروج", "logout.title": "تم تسجيل الخروج",
"logout.message": "قمت بتسجيل الخروج بنجاح من NodeBB", "logout.message": "قمت بتسجيل الخروج بنجاح من NodeBB",
"save_changes": "حفظ التغييرات", "save_changes": "حفظ التغييرات",
"close": "أغلق", "close": "أغلق",
"pagination": "Pagination",
"header.admin": "مشرف", "header.admin": "مشرف",
"header.recent": "حديث", "header.recent": "حديث",
"header.unread": "غير مقروء", "header.unread": "غير مقروء",
@ -48,5 +51,6 @@
"away": "Away", "away": "Away",
"dnd": "Do not Disturb", "dnd": "Do not Disturb",
"invisible": "Invisible", "invisible": "Invisible",
"offline": "Offline" "offline": "Offline",
"privacy": "Privacy"
} }

@ -1,6 +1,7 @@
{ {
"home": "Home", "home": "Home",
"unread": "Unread Topics", "unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics", "recent": "Recent Topics",
"users": "Registered Users", "users": "Registered Users",
"notifications": "Notifications", "notifications": "Notifications",

@ -20,6 +20,8 @@
"flag": "Flag", "flag": "Flag",
"flag_title": "Flag this post for moderation", "flag_title": "Flag this post for moderation",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
"watch": "Watch",
"share_this_post": "Share this Post",
"thread_tools.title": "أدوات الموضوع", "thread_tools.title": "أدوات الموضوع",
"thread_tools.markAsUnreadForAll": "علم غير مقروء", "thread_tools.markAsUnreadForAll": "علم غير مقروء",
"thread_tools.pin": "علق الموضوع", "thread_tools.pin": "علق الموضوع",

@ -26,6 +26,7 @@
"edit": "صحح", "edit": "صحح",
"uploaded_picture": "صورة تم تحميلها", "uploaded_picture": "صورة تم تحميلها",
"upload_new_picture": "تحميل صورة جديدة", "upload_new_picture": "تحميل صورة جديدة",
"current_password": "Current Password",
"change_password": "تغيير كلمة السر", "change_password": "تغيير كلمة السر",
"confirm_password": "تأكيد كلمة السر", "confirm_password": "تأكيد كلمة السر",
"password": "كلمة السر", "password": "كلمة السر",

@ -10,11 +10,14 @@
"500.message": "Jejda, vypadá to, že se něco pokazilo.", "500.message": "Jejda, vypadá to, že se něco pokazilo.",
"register": "Registrovat", "register": "Registrovat",
"login": "Přihlásit se", "login": "Přihlásit se",
"welcome_back": "Welcome Back ",
"you_have_successfully_logged_in": "You have successfully logged in",
"logout": "Odhlásit se", "logout": "Odhlásit se",
"logout.title": "Odhlásili jsme Vás.", "logout.title": "Odhlásili jsme Vás.",
"logout.message": "Úspěšně jsme Vás odhlásili z fóra.", "logout.message": "Úspěšně jsme Vás odhlásili z fóra.",
"save_changes": "Uložit změny", "save_changes": "Uložit změny",
"close": "Zrušit", "close": "Zrušit",
"pagination": "Pagination",
"header.admin": "Administrace", "header.admin": "Administrace",
"header.recent": "Aktuality", "header.recent": "Aktuality",
"header.unread": "Nepřečtené", "header.unread": "Nepřečtené",
@ -48,5 +51,6 @@
"away": "Pryč", "away": "Pryč",
"dnd": "Nerušit", "dnd": "Nerušit",
"invisible": "Neviditelný", "invisible": "Neviditelný",
"offline": "Offline" "offline": "Offline",
"privacy": "Privacy"
} }

@ -1,6 +1,7 @@
{ {
"home": "Home", "home": "Home",
"unread": "Unread Topics", "unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics", "recent": "Recent Topics",
"users": "Registered Users", "users": "Registered Users",
"notifications": "Notifications", "notifications": "Notifications",

@ -20,6 +20,8 @@
"flag": "Flag", "flag": "Flag",
"flag_title": "Flag this post for moderation", "flag_title": "Flag this post for moderation",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
"watch": "Watch",
"share_this_post": "Share this Post",
"thread_tools.title": "Nástroje", "thread_tools.title": "Nástroje",
"thread_tools.markAsUnreadForAll": "Označit jako nepřečtené", "thread_tools.markAsUnreadForAll": "Označit jako nepřečtené",
"thread_tools.pin": "Pin Topic", "thread_tools.pin": "Pin Topic",

@ -26,6 +26,7 @@
"edit": "Upravit", "edit": "Upravit",
"uploaded_picture": "Nahraný obrázek", "uploaded_picture": "Nahraný obrázek",
"upload_new_picture": "Nahrát nový obrázek", "upload_new_picture": "Nahrát nový obrázek",
"current_password": "Current Password",
"change_password": "Změnit heslo", "change_password": "Změnit heslo",
"confirm_password": "Potvrzení hesla", "confirm_password": "Potvrzení hesla",
"password": "Heslo", "password": "Heslo",

@ -10,11 +10,14 @@
"500.message": "Ooops! Looks like something went wrong!", "500.message": "Ooops! Looks like something went wrong!",
"register": "Registrierung", "register": "Registrierung",
"login": "Login", "login": "Login",
"welcome_back": "Willkommen zurück",
"you_have_successfully_logged_in": "Du hast dich erfolgreich eingeloggt",
"logout": "Logout", "logout": "Logout",
"logout.title": "Du bist ausgeloggt.", "logout.title": "Du bist ausgeloggt.",
"logout.message": "Du hast dich soeben erfolgreich aus dem Forum ausgeloggt.", "logout.message": "Du hast dich soeben erfolgreich aus dem Forum ausgeloggt.",
"save_changes": "Speichere Änderungen", "save_changes": "Speichere Änderungen",
"close": "Schließen", "close": "Schließen",
"pagination": "Seitennummerierung",
"header.admin": "Admin", "header.admin": "Admin",
"header.recent": "Aktuell", "header.recent": "Aktuell",
"header.unread": "Ungelesen", "header.unread": "Ungelesen",
@ -48,5 +51,6 @@
"away": "Abwesend", "away": "Abwesend",
"dnd": "Nicht stören", "dnd": "Nicht stören",
"invisible": "Unsichtbar", "invisible": "Unsichtbar",
"offline": "Offline" "offline": "Offline",
"privacy": "Privatsphäre"
} }

@ -1,7 +1,7 @@
{ {
"title": "Benachrichtigungen", "title": "Benachrichtigungen",
"no_notifs": "You have no new notifications", "no_notifs": "Du hast keine neuen Benachrichtigungen",
"see_all": "See all Notifications", "see_all": "Alle Benachrichtigungen ansehen",
"back_to_home": "Zurück zur Startseite", "back_to_home": "Zurück zur Startseite",
"outgoing_link": "Externer Link", "outgoing_link": "Externer Link",
"outgoing_link_message": "Du verlässt nun", "outgoing_link_message": "Du verlässt nun",

@ -1,6 +1,7 @@
{ {
"home": "Home", "home": "Home",
"unread": "Unread Topics", "unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics", "recent": "Recent Topics",
"users": "Registered Users", "users": "Registered Users",
"notifications": "Notifications", "notifications": "Notifications",

@ -3,5 +3,5 @@
"day": "Tag", "day": "Tag",
"week": "Woche", "week": "Woche",
"month": "Monat", "month": "Monat",
"no_recent_topics": "There are no recent topics." "no_recent_topics": "Es gibt keine aktuellen Themen."
} }

@ -2,7 +2,7 @@
"topic": "Thema", "topic": "Thema",
"topics": "Themen", "topics": "Themen",
"no_topics_found": "Keine passende Themen gefunden.", "no_topics_found": "Keine passende Themen gefunden.",
"no_posts_found": "No posts found!", "no_posts_found": "Keine Beiträge gefunden!",
"profile": "Profil", "profile": "Profil",
"posted_by": "Geposted von", "posted_by": "Geposted von",
"chat": "Chat", "chat": "Chat",
@ -19,17 +19,19 @@
"tools": "Tools", "tools": "Tools",
"flag": "Markieren", "flag": "Markieren",
"flag_title": "Diesen Beitrag zur Moderation markieren", "flag_title": "Diesen Beitrag zur Moderation markieren",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "deleted_message": "Dieser Thread wurde gelöscht. Nur Nutzer mit Thread-Management Rechten können ihn sehen.",
"watch": "Beobachten",
"share_this_post": "Diesen Beitrag teilen",
"thread_tools.title": "Thread Tools", "thread_tools.title": "Thread Tools",
"thread_tools.markAsUnreadForAll": "Als ungelesen markieren", "thread_tools.markAsUnreadForAll": "Als ungelesen markieren",
"thread_tools.pin": "Pin Topic", "thread_tools.pin": "Thema anpinnen",
"thread_tools.unpin": "Unpin Topic", "thread_tools.unpin": "Thema nicht mehr anpinnen",
"thread_tools.lock": "Lock Topic", "thread_tools.lock": "Thema schließen",
"thread_tools.unlock": "Unlock Topic", "thread_tools.unlock": "Thema öffnen",
"thread_tools.move": "Move Topic", "thread_tools.move": "Thema verschieben",
"thread_tools.fork": "Fork Topic", "thread_tools.fork": "Thema aufspalten",
"thread_tools.delete": "Delete Topic", "thread_tools.delete": "Thema löschen",
"thread_tools.restore": "Restore Topic", "thread_tools.restore": "Thema wiederherstellen",
"load_categories": "Kategorien laden", "load_categories": "Kategorien laden",
"disabled_categories_note": "Deaktivierte Kategorien sind ausgegraut.", "disabled_categories_note": "Deaktivierte Kategorien sind ausgegraut.",
"confirm_move": "verschieben", "confirm_move": "verschieben",
@ -39,10 +41,10 @@
"favourites.not_logged_in.title": "Nicht eingeloggt!", "favourites.not_logged_in.title": "Nicht eingeloggt!",
"favourites.not_logged_in.message": "Bitte logge dich ein, um diesen Beitrag favorisieren zu können.", "favourites.not_logged_in.message": "Bitte logge dich ein, um diesen Beitrag favorisieren zu können.",
"favourites.has_no_favourites": "Du hast noch keine Favoriten.", "favourites.has_no_favourites": "Du hast noch keine Favoriten.",
"vote.not_logged_in.title": "Not Logged In", "vote.not_logged_in.title": "Nicht eingeloggt",
"vote.not_logged_in.message": "Please log in in order to vote", "vote.not_logged_in.message": "Zum Bewerten bitte einloggen",
"vote.cant_vote_self.title": "Invalid Vote", "vote.cant_vote_self.title": "Ungültige Bewertung",
"vote.cant_vote_self.message": "You cannot vote for your own post", "vote.cant_vote_self.message": "Du kannst deinen eigenen Beitrag nicht bewerten",
"loading_more_posts": "Lade Mehr Posts", "loading_more_posts": "Lade Mehr Posts",
"move_topic": "Thema verschieben", "move_topic": "Thema verschieben",
"move_post": "Beitrag verschieben", "move_post": "Beitrag verschieben",
@ -53,11 +55,11 @@
"fork_success": "Thema erfolgreich aufgespalten!", "fork_success": "Thema erfolgreich aufgespalten!",
"reputation": "Reputation", "reputation": "Reputation",
"posts": "Beiträge", "posts": "Beiträge",
"composer.title_placeholder": "Enter your topic title here...", "composer.title_placeholder": "Hier den Titel des Themas eingeben...",
"composer.write": "Write", "composer.write": "Schreiben",
"composer.preview": "Preview", "composer.preview": "Vorschau",
"composer.discard": "Discard", "composer.discard": "Verwerfen",
"composer.submit": "Submit", "composer.submit": "Absenden",
"composer.replying_to": "Replying to", "composer.replying_to": "Als Antwort auf",
"composer.new_topic": "New Topic" "composer.new_topic": "Neues Thema"
} }

@ -9,7 +9,7 @@
"age": "Alter", "age": "Alter",
"joined": "Beigetreten", "joined": "Beigetreten",
"lastonline": "Zuletzt online", "lastonline": "Zuletzt online",
"profile": "Profile", "profile": "Profil",
"profile_views": "Profilaufrufe", "profile_views": "Profilaufrufe",
"reputation": "Reputation", "reputation": "Reputation",
"posts": "Posts", "posts": "Posts",
@ -20,27 +20,28 @@
"gravatar": "Gravatar", "gravatar": "Gravatar",
"birthday": "Geburtstag", "birthday": "Geburtstag",
"chat": "Chat", "chat": "Chat",
"follow": "Follow", "follow": "Folgen",
"unfollow": "Unfollow", "unfollow": "Nicht mehr folgen",
"change_picture": "Ändere Profilbild", "change_picture": "Ändere Profilbild",
"edit": "Ändern", "edit": "Ändern",
"uploaded_picture": "Hochgeladene Bilder", "uploaded_picture": "Hochgeladene Bilder",
"upload_new_picture": "Neues Bild hochladen", "upload_new_picture": "Neues Bild hochladen",
"current_password": "Aktuelles Passwort",
"change_password": "Ändere Passwort", "change_password": "Ändere Passwort",
"confirm_password": "Passwort wiederholen", "confirm_password": "Passwort wiederholen",
"password": "Passwort", "password": "Passwort",
"upload_picture": "Bild hochladen", "upload_picture": "Bild hochladen",
"upload_a_picture": "Ein Bild hochladen", "upload_a_picture": "Ein Bild hochladen",
"image_spec": "You may only upload PNG, JPG, or GIF files", "image_spec": "Du darfst nur Dateien vom Typ PNG, JPG oder GIF hochladen",
"max": "max.", "max": "max.",
"settings": "Einstellungen", "settings": "Einstellungen",
"show_email": "Zeige meine E-Mail Adresse an.", "show_email": "Zeige meine E-Mail Adresse an.",
"has_no_follower": "Dieser User hat noch keine Follower.", "has_no_follower": "Dieser User hat noch keine Follower.",
"follows_no_one": "Dieser User folgt noch niemanden.", "follows_no_one": "Dieser User folgt noch niemanden.",
"has_no_posts": "This user didn't post anything yet.", "has_no_posts": "Dieser Nutzer hat noch nichts gepostet.",
"email_hidden": "E-Mail Adresse versteckt", "email_hidden": "E-Mail Adresse versteckt",
"hidden": "versteckt", "hidden": "versteckt",
"paginate_description": "Paginate topics and posts instead of using infinite scroll.", "paginate_description": "Themen und Beiträge auf Seiten aufteilen statt unendliches Scrollen verweden",
"topics_per_page": "Topics per Page", "topics_per_page": "Themen pro Seite",
"posts_per_page": "Posts per Page" "posts_per_page": "Beiträge pro Seite"
} }

@ -11,6 +11,9 @@
"register": "Register", "register": "Register",
"login": "Login", "login": "Login",
"please_log_in": "Please Log In",
"posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
"welcome_back": "Welcome Back ", "welcome_back": "Welcome Back ",
"you_have_successfully_logged_in": "You have successfully logged in", "you_have_successfully_logged_in": "You have successfully logged in",

@ -1,6 +1,7 @@
{ {
"home": "Home", "home": "Home",
"unread": "Unread Topics", "unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics", "recent": "Recent Topics",
"users": "Registered Users", "users": "Registered Users",
"notifications": "Notifications", "notifications": "Notifications",

@ -24,6 +24,13 @@
"flag_title": "Flag this post for moderation", "flag_title": "Flag this post for moderation",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
"following_topic.title": "Following Topic",
"following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
"not_following_topic.title": "Not Following Topic",
"not_following_topic.message": "You will no longer receive notifications from this topic.",
"login_to_subscribe": "Please register or log in in order to subscribe to this topic",
"watch": "Watch", "watch": "Watch",
"share_this_post": "Share this Post", "share_this_post": "Share this Post",
@ -79,5 +86,8 @@
"composer.thumb_title": "Add a thumbnail to this topic", "composer.thumb_title": "Add a thumbnail to this topic",
"composer.thumb_url_placeholder": "http://example.com/thumb.png", "composer.thumb_url_placeholder": "http://example.com/thumb.png",
"composer.thumb_file_label": "Or upload a file", "composer.thumb_file_label": "Or upload a file",
"composer.thumb_remove": "Clear fields" "composer.thumb_remove": "Clear fields",
"composer.drag_and_drop_images": "Drag and Drop Images Here",
"composer.content_is_parsed_with": "Content is parsed with",
"composer.upload_instructions": "Upload images by dragging & dropping them."
} }

@ -10,11 +10,14 @@
"500.message": "Ooops! Algo salio mal!, No te alarmes. Nuestros simios hiperinteligentes lo solucionarán", "500.message": "Ooops! Algo salio mal!, No te alarmes. Nuestros simios hiperinteligentes lo solucionarán",
"register": "Registrarse", "register": "Registrarse",
"login": "Conectarse", "login": "Conectarse",
"welcome_back": "Bienvenido de nuevo !",
"you_have_successfully_logged_in": "Te has conectado!",
"logout": "Salir", "logout": "Salir",
"logout.title": "Te has desconectado.", "logout.title": "Te has desconectado.",
"logout.message": "Haz sido desconectado correctamente", "logout.message": "Haz sido desconectado correctamente",
"save_changes": "Guardar Cambios", "save_changes": "Guardar Cambios",
"close": "Cerrar", "close": "Cerrar",
"pagination": "Paginación",
"header.admin": "Admin", "header.admin": "Admin",
"header.recent": "Recientes", "header.recent": "Recientes",
"header.unread": "No Leeidos", "header.unread": "No Leeidos",
@ -48,5 +51,6 @@
"away": "No disponible", "away": "No disponible",
"dnd": "No molestar", "dnd": "No molestar",
"invisible": "Invisible", "invisible": "Invisible",
"offline": "Desconectado" "offline": "Desconectado",
"privacy": "Privacidad"
} }

@ -1,6 +1,6 @@
{ {
"title": "Notificaciones", "title": "Notificaciones",
"no_notifs": "You have no new notifications", "no_notifs": "No tiene nuevas notificaciones",
"see_all": "Ver todas las notificaciones", "see_all": "Ver todas las notificaciones",
"back_to_home": "Volver al Inicio", "back_to_home": "Volver al Inicio",
"outgoing_link": "Link Externo", "outgoing_link": "Link Externo",

@ -1,6 +1,7 @@
{ {
"home": "Home", "home": "Home",
"unread": "Unread Topics", "unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics", "recent": "Recent Topics",
"users": "Registered Users", "users": "Registered Users",
"notifications": "Notifications", "notifications": "Notifications",

@ -20,6 +20,8 @@
"flag": "Reportar", "flag": "Reportar",
"flag_title": "Reportar este post a los moderadores", "flag_title": "Reportar este post a los moderadores",
"deleted_message": "Este tema ha sido borrado. Solo los miembros con privilegios pueden verlo.", "deleted_message": "Este tema ha sido borrado. Solo los miembros con privilegios pueden verlo.",
"watch": "Seguir",
"share_this_post": "Compartir este post",
"thread_tools.title": "Herramientas del Tema", "thread_tools.title": "Herramientas del Tema",
"thread_tools.markAsUnreadForAll": "Marcar como no leido", "thread_tools.markAsUnreadForAll": "Marcar como no leido",
"thread_tools.pin": "Tema Importante", "thread_tools.pin": "Tema Importante",

@ -19,19 +19,20 @@
"signature": "Firma", "signature": "Firma",
"gravatar": "Gravatar", "gravatar": "Gravatar",
"birthday": "Cumpleaños", "birthday": "Cumpleaños",
"chat": "Chat", "chat": "Chat!",
"follow": "Follow", "follow": "Seguir",
"unfollow": "Unfollow", "unfollow": "Dejar de Seguir",
"change_picture": "Cambiar Foto", "change_picture": "Cambiar Foto",
"edit": "Editar", "edit": "Editar",
"uploaded_picture": "Fotos Cargadas", "uploaded_picture": "Fotos Cargadas",
"upload_new_picture": "Cargar Nueva Foto", "upload_new_picture": "Cargar Nueva Foto",
"current_password": "Password actual",
"change_password": "Cambiar Contraseña", "change_password": "Cambiar Contraseña",
"confirm_password": "Confirmar Contraseña", "confirm_password": "Confirmar Contraseña",
"password": "Contraseña", "password": "Contraseña",
"upload_picture": "Cargar foto", "upload_picture": "Cargar foto",
"upload_a_picture": "Cargar una foto", "upload_a_picture": "Cargar una foto",
"image_spec": "You may only upload PNG, JPG, or GIF files", "image_spec": "Solo puedes subir, PNG, JPG o Archivos GIF.",
"max": "max.", "max": "max.",
"settings": "Opciones", "settings": "Opciones",
"show_email": "Mostrar mi Email", "show_email": "Mostrar mi Email",
@ -40,7 +41,7 @@
"has_no_posts": "Este usuario aun no ha publicado nada.", "has_no_posts": "Este usuario aun no ha publicado nada.",
"email_hidden": "Email Oculto", "email_hidden": "Email Oculto",
"hidden": "oculto", "hidden": "oculto",
"paginate_description": "Paginate topics and posts instead of using infinite scroll.", "paginate_description": "La paginación de los temas no es por pagina, ya que tiene scroll infinito.",
"topics_per_page": "Topics per Page", "topics_per_page": "Temas por pagina",
"posts_per_page": "Posts per Page" "posts_per_page": "Post por pagina"
} }

@ -10,11 +10,14 @@
"500.message": "Oho! Jotain meni pieleen!", "500.message": "Oho! Jotain meni pieleen!",
"register": "Rekisteröidy", "register": "Rekisteröidy",
"login": "Kirjaudu", "login": "Kirjaudu",
"welcome_back": "Welcome Back ",
"you_have_successfully_logged_in": "You have successfully logged in",
"logout": "Kirjaudu ulos", "logout": "Kirjaudu ulos",
"logout.title": "Olet nyt kirjaunut ulos.", "logout.title": "Olet nyt kirjaunut ulos.",
"logout.message": "Olet onnistuneesti kirjautunut ulos NodeBB:stä", "logout.message": "Olet onnistuneesti kirjautunut ulos NodeBB:stä",
"save_changes": "Tallenna muutokset", "save_changes": "Tallenna muutokset",
"close": "Sulje", "close": "Sulje",
"pagination": "Pagination",
"header.admin": "Admin", "header.admin": "Admin",
"header.recent": "Viimeisimmät", "header.recent": "Viimeisimmät",
"header.unread": "Lukemattomat", "header.unread": "Lukemattomat",
@ -48,5 +51,6 @@
"away": "Away", "away": "Away",
"dnd": "Do not Disturb", "dnd": "Do not Disturb",
"invisible": "Invisible", "invisible": "Invisible",
"offline": "Offline" "offline": "Offline",
"privacy": "Privacy"
} }

@ -1,6 +1,7 @@
{ {
"home": "Home", "home": "Home",
"unread": "Unread Topics", "unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics", "recent": "Recent Topics",
"users": "Registered Users", "users": "Registered Users",
"notifications": "Notifications", "notifications": "Notifications",

@ -20,6 +20,8 @@
"flag": "Flag", "flag": "Flag",
"flag_title": "Flag this post for moderation", "flag_title": "Flag this post for moderation",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
"watch": "Watch",
"share_this_post": "Share this Post",
"thread_tools.title": "Ketjun työkalut", "thread_tools.title": "Ketjun työkalut",
"thread_tools.markAsUnreadForAll": "Merkitse luetuiksi", "thread_tools.markAsUnreadForAll": "Merkitse luetuiksi",
"thread_tools.pin": "Pin Topic", "thread_tools.pin": "Pin Topic",

@ -26,6 +26,7 @@
"edit": "Muokkaa", "edit": "Muokkaa",
"uploaded_picture": "Siirretty kuva", "uploaded_picture": "Siirretty kuva",
"upload_new_picture": "Siirrä uusi kuva", "upload_new_picture": "Siirrä uusi kuva",
"current_password": "Current Password",
"change_password": "Vaihda salasanaa", "change_password": "Vaihda salasanaa",
"confirm_password": "Vahvista salasanaa", "confirm_password": "Vahvista salasanaa",
"password": "Salasana", "password": "Salasana",

@ -7,7 +7,7 @@
"posts": "messages", "posts": "messages",
"views": "vues", "views": "vues",
"posted": "posté", "posted": "posté",
"browsing": "parcourt", "browsing": "parcouru par",
"no_replies": "Personne n'a répondu", "no_replies": "Personne n'a répondu",
"replied": "répondu", "replied": "répondu",
"last_edited_by": "dernière édition par" "last_edited_by": "dernière édition par"

@ -10,11 +10,14 @@
"500.message": "Oops! Il semblerait que quelque chose se soit mal passé!", "500.message": "Oops! Il semblerait que quelque chose se soit mal passé!",
"register": "S'inscrire", "register": "S'inscrire",
"login": "Connecter", "login": "Connecter",
"welcome_back": "Bon retour parmis nous",
"you_have_successfully_logged_in": "Vous vous êtes connecté avec succès.",
"logout": "Déconnection", "logout": "Déconnection",
"logout.title": "Vous êtes maintenant déconnecté.", "logout.title": "Vous êtes maintenant déconnecté.",
"logout.message": "Vous vous êtes déconnecté de NodeBB avec succès", "logout.message": "Vous vous êtes déconnecté de NodeBB avec succès",
"save_changes": "Enregistrer les changements", "save_changes": "Enregistrer les changements",
"close": "Fermer", "close": "Fermer",
"pagination": "Pagination",
"header.admin": "Admin", "header.admin": "Admin",
"header.recent": "Récent", "header.recent": "Récent",
"header.unread": "Non Lu", "header.unread": "Non Lu",
@ -48,5 +51,6 @@
"away": "Absent", "away": "Absent",
"dnd": "Occupé", "dnd": "Occupé",
"invisible": "Invisible", "invisible": "Invisible",
"offline": "Hors ligne" "offline": "Hors ligne",
"privacy": "Vie privée"
} }

@ -1,6 +1,7 @@
{ {
"home": "Accueil", "home": "Accueil",
"unread": "Sujets non lus", "unread": "Sujets non lus",
"popular": "Popular Topics",
"recent": "Sujets Récents", "recent": "Sujets Récents",
"users": "Utilisateurs enregistrés", "users": "Utilisateurs enregistrés",
"notifications": "Notifications", "notifications": "Notifications",

@ -3,5 +3,5 @@
"day": "Jour", "day": "Jour",
"week": "Semaine", "week": "Semaine",
"month": "Mois", "month": "Mois",
"no_recent_topics": "There are no recent topics." "no_recent_topics": "Il n'y a aucun sujet récent."
} }

@ -20,16 +20,18 @@
"flag": "Signaler", "flag": "Signaler",
"flag_title": "Signaler ce post pour modération", "flag_title": "Signaler ce post pour modération",
"deleted_message": "Ce sujet a été supprimé. Seuls les utilsateurs avec les droits d'administration peuvent le voir.", "deleted_message": "Ce sujet a été supprimé. Seuls les utilsateurs avec les droits d'administration peuvent le voir.",
"watch": "Suivre",
"share_this_post": "Partager ce message",
"thread_tools.title": "Outils du Fil", "thread_tools.title": "Outils du Fil",
"thread_tools.markAsUnreadForAll": "Marquer comme non lu", "thread_tools.markAsUnreadForAll": "Marquer comme non lu",
"thread_tools.pin": "Epingler le Sujet", "thread_tools.pin": "Epingler le Sujet",
"thread_tools.unpin": "Unpin Topic", "thread_tools.unpin": "Désépingler le sujet",
"thread_tools.lock": "Lock Topic", "thread_tools.lock": "Verrouiller le sujet",
"thread_tools.unlock": "Unlock Topic", "thread_tools.unlock": "Déverouiller le sujet",
"thread_tools.move": "Move Topic", "thread_tools.move": "Déplacer le sujet",
"thread_tools.fork": "Fork Topic", "thread_tools.fork": "Scinder le sujet",
"thread_tools.delete": "Delete Topic", "thread_tools.delete": "Supprimer le sujet",
"thread_tools.restore": "Restore Topic", "thread_tools.restore": "Restaurer le sujet",
"load_categories": "Chargement des Categories", "load_categories": "Chargement des Categories",
"disabled_categories_note": "Les catégories désactivées sont grisées", "disabled_categories_note": "Les catégories désactivées sont grisées",
"confirm_move": "Déplacer", "confirm_move": "Déplacer",
@ -53,11 +55,11 @@
"fork_success": "Topic scindé !", "fork_success": "Topic scindé !",
"reputation": "Réputation", "reputation": "Réputation",
"posts": "Messages", "posts": "Messages",
"composer.title_placeholder": "Enter your topic title here...", "composer.title_placeholder": "Entrer le titre du sujet ici...",
"composer.write": "Write", "composer.write": "Ecriture",
"composer.preview": "Preview", "composer.preview": "Aperçu",
"composer.discard": "Discard", "composer.discard": "Abandon",
"composer.submit": "Submit", "composer.submit": "Envoi",
"composer.replying_to": "Replying to", "composer.replying_to": "Répondre à",
"composer.new_topic": "New Topic" "composer.new_topic": "Nouveau Sujet"
} }

@ -26,6 +26,7 @@
"edit": "Editer", "edit": "Editer",
"uploaded_picture": "Image uploadée", "uploaded_picture": "Image uploadée",
"upload_new_picture": "Uploader une nouvelle image", "upload_new_picture": "Uploader une nouvelle image",
"current_password": "Mot de passe actuel",
"change_password": "Changer le mot de passe", "change_password": "Changer le mot de passe",
"confirm_password": "Confirmer le mot de passe", "confirm_password": "Confirmer le mot de passe",
"password": "Mot de passe", "password": "Mot de passe",

@ -10,11 +10,14 @@
"500.message": "אופס! נראה שמשהו השתבש!", "500.message": "אופס! נראה שמשהו השתבש!",
"register": "הרשמה", "register": "הרשמה",
"login": "התחברות", "login": "התחברות",
"welcome_back": "ברוכים השבים",
"you_have_successfully_logged_in": "התחברת בהצלחה",
"logout": "יציאה", "logout": "יציאה",
"logout.title": "אתה מנותק כעת.", "logout.title": "אתה מנותק כעת.",
"logout.message": "התנתקת בהצלחה מ NodeBB.", "logout.message": "התנתקת בהצלחה מ NodeBB.",
"save_changes": "שמור שינויים", "save_changes": "שמור שינויים",
"close": "סגור", "close": "סגור",
"pagination": "עימוד",
"header.admin": "ניהול", "header.admin": "ניהול",
"header.recent": "פוסטים אחרונים", "header.recent": "פוסטים אחרונים",
"header.unread": "לא נקרא", "header.unread": "לא נקרא",
@ -48,5 +51,6 @@
"away": "לא נמצא", "away": "לא נמצא",
"dnd": "לא להפריע", "dnd": "לא להפריע",
"invisible": "מוסתר", "invisible": "מוסתר",
"offline": "מנותק" "offline": "מנותק",
"privacy": "פרטיות"
} }

@ -1,6 +1,6 @@
{ {
"title": "התראות", "title": "התראות",
"no_notifs": "You have no new notifications", "no_notifs": "אין התראות",
"see_all": "צפה בכל ההתראות", "see_all": "צפה בכל ההתראות",
"back_to_home": "חזרה ל NodeBB", "back_to_home": "חזרה ל NodeBB",
"outgoing_link": "לינק", "outgoing_link": "לינק",

@ -1,6 +1,7 @@
{ {
"home": "דף הבית", "home": "דף הבית",
"unread": "נושאים שלא נקראו", "unread": "נושאים שלא נקראו",
"popular": "Popular Topics",
"recent": "נושאים אחרונים", "recent": "נושאים אחרונים",
"users": "משתמשים רשומים", "users": "משתמשים רשומים",
"notifications": "התראות", "notifications": "התראות",

@ -12,7 +12,7 @@
"confirm_password": "אמת סיסמה", "confirm_password": "אמת סיסמה",
"confirm_password_placeholder": "אמת סיסמה", "confirm_password_placeholder": "אמת סיסמה",
"register_now_button": "הרשם עכשיו", "register_now_button": "הרשם עכשיו",
"alternative_registration": "הרשמה אלטרנטיבית", "alternative_registration": "הרשם באמצעות...",
"terms_of_use": "תנאי שימוש", "terms_of_use": "תנאי שימוש",
"agree_to_terms_of_use": "אני מסכים לתנאי השימוש" "agree_to_terms_of_use": "אני מסכים לתנאי השימוש"
} }

@ -20,6 +20,8 @@
"flag": "דווח", "flag": "דווח",
"flag_title": "דווח על פוסט זה למנהל", "flag_title": "דווח על פוסט זה למנהל",
"deleted_message": "הנושא הזה נמחק. רק מנהלים מורשים לראות אותו", "deleted_message": "הנושא הזה נמחק. רק מנהלים מורשים לראות אותו",
"watch": "עקוב",
"share_this_post": "שתף פוסט זה",
"thread_tools.title": "כלים", "thread_tools.title": "כלים",
"thread_tools.markAsUnreadForAll": "סמן כלא נקרא", "thread_tools.markAsUnreadForAll": "סמן כלא נקרא",
"thread_tools.pin": "נעץ נושא", "thread_tools.pin": "נעץ נושא",

@ -19,20 +19,21 @@
"signature": "חתימה", "signature": "חתימה",
"gravatar": "אווטר", "gravatar": "אווטר",
"birthday": "יום הולדת", "birthday": "יום הולדת",
"chat": "Chat", "chat": "צ'אט",
"follow": "Follow", "follow": "עקוב",
"unfollow": "Unfollow", "unfollow": "הפסק לעקוב",
"change_picture": "שנה תמונה", "change_picture": "שנה תמונה",
"edit": "ערוך", "edit": "ערוך",
"uploaded_picture": "התמונה הועלתה", "uploaded_picture": "התמונה הועלתה",
"upload_new_picture": "העלה תמונה חדשה", "upload_new_picture": "העלה תמונה חדשה",
"current_password": "סיסמה נוכחית",
"change_password": "שנה סיסמה", "change_password": "שנה סיסמה",
"confirm_password": "אמת סיסמה", "confirm_password": "אמת סיסמה",
"password": "סיסמה", "password": "סיסמה",
"upload_picture": "העלה תמונה", "upload_picture": "העלה תמונה",
"upload_a_picture": "העלה תמונה", "upload_a_picture": "העלה תמונה",
"image_spec": "You may only upload PNG, JPG, or GIF files", "image_spec": "ניתן להעלות תמונות בפורמט PNG, JPG או GIF בלבד",
"max": "max.", "max": "מקסימום",
"settings": "הגדרות", "settings": "הגדרות",
"show_email": "פרסם את כתובת האימייל שלי", "show_email": "פרסם את כתובת האימייל שלי",
"has_no_follower": "למשתמש זה אין עוקבים :(", "has_no_follower": "למשתמש זה אין עוקבים :(",
@ -40,7 +41,7 @@
"has_no_posts": "המשתמש הזה עוד לא פרסם כלום.", "has_no_posts": "המשתמש הזה עוד לא פרסם כלום.",
"email_hidden": "כתובת אימייל מוסתרת", "email_hidden": "כתובת אימייל מוסתרת",
"hidden": "מוסתר", "hidden": "מוסתר",
"paginate_description": "Paginate topics and posts instead of using infinite scroll.", "paginate_description": "צור עימוד לנושאים במקום לטעון את כל התוכן בעמוד אחד.",
"topics_per_page": "Topics per Page", "topics_per_page": "כמות נושאים בעמוד",
"posts_per_page": "Posts per Page" "posts_per_page": "כמות פוסטים בעמוד"
} }

@ -1,6 +1,7 @@
{ {
"home": "Kezdőlap", "home": "Kezdőlap",
"unread": "Olvasatlan Topikok", "unread": "Olvasatlan Topikok",
"popular": "Popular Topics",
"recent": "Friss Topikok", "recent": "Friss Topikok",
"users": "Regisztrált Felhasználók", "users": "Regisztrált Felhasználók",
"notifications": "Értesítések", "notifications": "Értesítések",

@ -10,11 +10,14 @@
"500.message": "Oops! Qualcosa non funziona come si deve!", "500.message": "Oops! Qualcosa non funziona come si deve!",
"register": "Registrazione", "register": "Registrazione",
"login": "Login", "login": "Login",
"welcome_back": "Welcome Back ",
"you_have_successfully_logged_in": "You have successfully logged in",
"logout": "Logout", "logout": "Logout",
"logout.title": "Disconnessione avvenuta.", "logout.title": "Disconnessione avvenuta.",
"logout.message": "Logout effettuato con successo", "logout.message": "Logout effettuato con successo",
"save_changes": "Salva", "save_changes": "Salva",
"close": "Chiudi", "close": "Chiudi",
"pagination": "Pagination",
"header.admin": "Amministratore", "header.admin": "Amministratore",
"header.recent": "Recenti", "header.recent": "Recenti",
"header.unread": "Non letti", "header.unread": "Non letti",
@ -48,5 +51,6 @@
"away": "Away", "away": "Away",
"dnd": "Do not Disturb", "dnd": "Do not Disturb",
"invisible": "Invisible", "invisible": "Invisible",
"offline": "Offline" "offline": "Offline",
"privacy": "Privacy"
} }

@ -1,6 +1,7 @@
{ {
"home": "Home", "home": "Home",
"unread": "Unread Topics", "unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics", "recent": "Recent Topics",
"users": "Registered Users", "users": "Registered Users",
"notifications": "Notifications", "notifications": "Notifications",

@ -20,6 +20,8 @@
"flag": "Flag", "flag": "Flag",
"flag_title": "Flag this post for moderation", "flag_title": "Flag this post for moderation",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
"watch": "Watch",
"share_this_post": "Share this Post",
"thread_tools.title": "Strumenti per il Thread", "thread_tools.title": "Strumenti per il Thread",
"thread_tools.markAsUnreadForAll": "Mark Unread", "thread_tools.markAsUnreadForAll": "Mark Unread",
"thread_tools.pin": "Pin Topic", "thread_tools.pin": "Pin Topic",

@ -26,6 +26,7 @@
"edit": "Modifica", "edit": "Modifica",
"uploaded_picture": "Foto caricata", "uploaded_picture": "Foto caricata",
"upload_new_picture": "Carica una nuova foto", "upload_new_picture": "Carica una nuova foto",
"current_password": "Current Password",
"change_password": "Cambia la Password", "change_password": "Cambia la Password",
"confirm_password": "Conferma la Password", "confirm_password": "Conferma la Password",
"password": "Password", "password": "Password",

@ -10,14 +10,14 @@
"500.message": "Oops! Ser ut som noe gikk galt!", "500.message": "Oops! Ser ut som noe gikk galt!",
"register": "Registrer", "register": "Registrer",
"login": "Logg inn", "login": "Logg inn",
"welcome_back": "Welcome Back ", "welcome_back": "Velkommen tilbake",
"you_have_successfully_logged_in": "You have successfully logged in", "you_have_successfully_logged_in": "Du har blitt logget inn",
"logout": "Logg ut", "logout": "Logg ut",
"logout.title": "Du er nå logget ut.", "logout.title": "Du er nå logget ut.",
"logout.message": "Du er nå logget ut av NodeBB", "logout.message": "Du er nå logget ut av NodeBB",
"save_changes": "Lagre endringer", "save_changes": "Lagre endringer",
"close": "Steng", "close": "Steng",
"pagination": "Pagination", "pagination": "Paginering",
"header.admin": "Admin", "header.admin": "Admin",
"header.recent": "Seneste", "header.recent": "Seneste",
"header.unread": "Uleste", "header.unread": "Uleste",
@ -52,5 +52,5 @@
"dnd": "Ikke forsturr", "dnd": "Ikke forsturr",
"invisible": "Usynlig", "invisible": "Usynlig",
"offline": "Offline", "offline": "Offline",
"privacy": "Privacy" "privacy": "Personvern"
} }

@ -1,6 +1,7 @@
{ {
"home": "Hjem", "home": "Hjem",
"unread": "Uleste emner", "unread": "Uleste emner",
"popular": "Popular Topics",
"recent": "Seneste emner", "recent": "Seneste emner",
"users": "Registrerte brukere", "users": "Registrerte brukere",
"notifications": "Varsler", "notifications": "Varsler",

@ -20,8 +20,8 @@
"flag": "Rapporter", "flag": "Rapporter",
"flag_title": "Rapporter dette innlegget for granskning", "flag_title": "Rapporter dette innlegget for granskning",
"deleted_message": "Denne tråden har blitt slettet. Bare brukere med trådhåndterings-privilegier kan se den.", "deleted_message": "Denne tråden har blitt slettet. Bare brukere med trådhåndterings-privilegier kan se den.",
"watch": "Watch", "watch": "Overvåk",
"share_this_post": "Share this Post", "share_this_post": "Del ditt innlegg",
"thread_tools.title": "Trådverktøy", "thread_tools.title": "Trådverktøy",
"thread_tools.markAsUnreadForAll": "Marker som ulest", "thread_tools.markAsUnreadForAll": "Marker som ulest",
"thread_tools.pin": "Fest tråd", "thread_tools.pin": "Fest tråd",

@ -26,7 +26,7 @@
"edit": "Endre", "edit": "Endre",
"uploaded_picture": "Opplastet bilde", "uploaded_picture": "Opplastet bilde",
"upload_new_picture": "Last opp nytt bidle", "upload_new_picture": "Last opp nytt bidle",
"current_password": "Current Password", "current_password": "Gjeldende passord",
"change_password": "Endre passord", "change_password": "Endre passord",
"confirm_password": "Bekreft passord", "confirm_password": "Bekreft passord",
"password": "Passord", "password": "Passord",

@ -10,14 +10,14 @@
"500.message": "Coś poszło nie tak.", "500.message": "Coś poszło nie tak.",
"register": "Zarejestruj się", "register": "Zarejestruj się",
"login": "Zaloguj się", "login": "Zaloguj się",
"welcome_back": "Welcome Back ", "welcome_back": "Witaj z powrotem!",
"you_have_successfully_logged_in": "You have successfully logged in", "you_have_successfully_logged_in": "Zostałeś pomyślnie zalogowany.",
"logout": "Wyloguj się", "logout": "Wyloguj się",
"logout.title": "Wylogowałeś się.", "logout.title": "Wylogowałeś się.",
"logout.message": "Pomyślnie wylogowałeś się z forum.", "logout.message": "Pomyślnie wylogowałeś się z forum.",
"save_changes": "Zapisz zmiany", "save_changes": "Zapisz zmiany",
"close": "Zamknij", "close": "Zamknij",
"pagination": "Pagination", "pagination": "Numerowanie stron",
"header.admin": "Administracja", "header.admin": "Administracja",
"header.recent": "Ostatnie", "header.recent": "Ostatnie",
"header.unread": "Nieprzeczytane", "header.unread": "Nieprzeczytane",
@ -52,5 +52,5 @@
"dnd": "Nie przeszkadzać", "dnd": "Nie przeszkadzać",
"invisible": "Niewidoczny", "invisible": "Niewidoczny",
"offline": "Niedostępny", "offline": "Niedostępny",
"privacy": "Privacy" "privacy": "Prywatność"
} }

@ -1,6 +1,7 @@
{ {
"home": "Strona główna", "home": "Strona główna",
"unread": "Nieprzeczytane wątki", "unread": "Nieprzeczytane wątki",
"popular": "Popular Topics",
"recent": "Ostatnie wątki", "recent": "Ostatnie wątki",
"users": "Zarejestrowani użytkownicy", "users": "Zarejestrowani użytkownicy",
"notifications": "Powiadomienia", "notifications": "Powiadomienia",

@ -19,15 +19,15 @@
"tools": "Narzędzia", "tools": "Narzędzia",
"flag": "Zgłoś", "flag": "Zgłoś",
"flag_title": "Zgłoś post do moderacji", "flag_title": "Zgłoś post do moderacji",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "deleted_message": "Ten wątek został usunięty. Tylko użytkownicy z uprawnieniami do zarządzania wątkami mogą go widzieć.",
"watch": "Watch", "watch": "Obserwuj",
"share_this_post": "Share this Post", "share_this_post": "Udostępnij",
"thread_tools.title": "Narzędzia wątków", "thread_tools.title": "Narzędzia wątków",
"thread_tools.markAsUnreadForAll": "Oznacz jako nieprzeczytany", "thread_tools.markAsUnreadForAll": "Oznacz jako nieprzeczytany",
"thread_tools.pin": "Przypnij wątek", "thread_tools.pin": "Przypnij wątek",
"thread_tools.unpin": "Unpin Topic", "thread_tools.unpin": "Odepnij wątek",
"thread_tools.lock": "Zamknij wątek", "thread_tools.lock": "Zamknij wątek",
"thread_tools.unlock": "Unlock Topic", "thread_tools.unlock": "Otwórz wątek",
"thread_tools.move": "Przenieś wątek", "thread_tools.move": "Przenieś wątek",
"thread_tools.fork": "Skopiuj wątek", "thread_tools.fork": "Skopiuj wątek",
"thread_tools.delete": "Usuń wątek", "thread_tools.delete": "Usuń wątek",

@ -26,7 +26,7 @@
"edit": "Edytuj", "edit": "Edytuj",
"uploaded_picture": "Przesłane zdjęcie", "uploaded_picture": "Przesłane zdjęcie",
"upload_new_picture": "Prześlij nowe zdjęcie", "upload_new_picture": "Prześlij nowe zdjęcie",
"current_password": "Current Password", "current_password": "Obecne hasło",
"change_password": "Zmień hasło", "change_password": "Zmień hasło",
"confirm_password": "Potwierdź hasło", "confirm_password": "Potwierdź hasło",
"password": "Hasło", "password": "Hasło",

@ -10,11 +10,14 @@
"500.message": "Oops! deu algo errado!", "500.message": "Oops! deu algo errado!",
"register": "Cadastrar", "register": "Cadastrar",
"login": "Logar", "login": "Logar",
"welcome_back": "Welcome Back ",
"you_have_successfully_logged_in": "You have successfully logged in",
"logout": "Logout", "logout": "Logout",
"logout.title": "Logout com sucesso.", "logout.title": "Logout com sucesso.",
"logout.message": "Logado com Sucesso!", "logout.message": "Logado com Sucesso!",
"save_changes": "Salvar Alterações", "save_changes": "Salvar Alterações",
"close": "Fechar", "close": "Fechar",
"pagination": "Pagination",
"header.admin": "Admin", "header.admin": "Admin",
"header.recent": "Recente", "header.recent": "Recente",
"header.unread": "Não Lido", "header.unread": "Não Lido",
@ -48,5 +51,6 @@
"away": "Ausente", "away": "Ausente",
"dnd": "Não Perturbe", "dnd": "Não Perturbe",
"invisible": "Invisível", "invisible": "Invisível",
"offline": "Offline" "offline": "Offline",
"privacy": "Privacy"
} }

@ -1,6 +1,7 @@
{ {
"home": "Home", "home": "Home",
"unread": "Tópicos Não Lidos", "unread": "Tópicos Não Lidos",
"popular": "Popular Topics",
"recent": "Tópicos Recentes", "recent": "Tópicos Recentes",
"users": "Usuários Registrados", "users": "Usuários Registrados",
"notifications": "Notificações", "notifications": "Notificações",

@ -20,6 +20,8 @@
"flag": "Marcar", "flag": "Marcar",
"flag_title": "Marcar este post para moderação", "flag_title": "Marcar este post para moderação",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
"watch": "Watch",
"share_this_post": "Share this Post",
"thread_tools.title": "Ferramentas da Thread", "thread_tools.title": "Ferramentas da Thread",
"thread_tools.markAsUnreadForAll": "Marcar como não lido", "thread_tools.markAsUnreadForAll": "Marcar como não lido",
"thread_tools.pin": "Pin Topic", "thread_tools.pin": "Pin Topic",

@ -26,6 +26,7 @@
"edit": "Editar", "edit": "Editar",
"uploaded_picture": "Foto Carregada", "uploaded_picture": "Foto Carregada",
"upload_new_picture": "Carregar novo Foto", "upload_new_picture": "Carregar novo Foto",
"current_password": "Current Password",
"change_password": "Alterar Senha", "change_password": "Alterar Senha",
"confirm_password": "Confirmar Senha", "confirm_password": "Confirmar Senha",
"password": "Senha", "password": "Senha",

@ -10,11 +10,14 @@
"500.message": "Упс! Похоже, что-то пошло не так!", "500.message": "Упс! Похоже, что-то пошло не так!",
"register": "Зарегистрироваться", "register": "Зарегистрироваться",
"login": "Войти", "login": "Войти",
"welcome_back": "Welcome Back ",
"you_have_successfully_logged_in": "You have successfully logged in",
"logout": "Выйти", "logout": "Выйти",
"logout.title": "Вы успешно вышли.", "logout.title": "Вы успешно вышли.",
"logout.message": "Вы успешно вышли из NodeBB", "logout.message": "Вы успешно вышли из NodeBB",
"save_changes": "Сохранить изменения", "save_changes": "Сохранить изменения",
"close": "Закрыть", "close": "Закрыть",
"pagination": "Pagination",
"header.admin": "Админка", "header.admin": "Админка",
"header.recent": "Последние", "header.recent": "Последние",
"header.unread": "Непрочитанное", "header.unread": "Непрочитанное",
@ -48,5 +51,6 @@
"away": "Отсутствует", "away": "Отсутствует",
"dnd": "Не беспокоить", "dnd": "Не беспокоить",
"invisible": "Невидимый", "invisible": "Невидимый",
"offline": "Не в сети" "offline": "Не в сети",
"privacy": "Privacy"
} }

@ -1,7 +1,7 @@
{ {
"title": "Уведомления", "title": "Уведомления",
"no_notifs": "You have no new notifications", "no_notifs": "Для Вас нет новых уведомлений",
"see_all": "See all Notifications", "see_all": "Просмотреть все уведомления",
"back_to_home": "Вернуться на NodeBB", "back_to_home": "Вернуться на NodeBB",
"outgoing_link": "Внешняя ссылка", "outgoing_link": "Внешняя ссылка",
"outgoing_link_message": "Вы покидаете", "outgoing_link_message": "Вы покидаете",

@ -1,6 +1,7 @@
{ {
"home": "Главная", "home": "Главная",
"unread": "Непрочитанные темы", "unread": "Непрочитанные темы",
"popular": "Popular Topics",
"recent": "Последние темы", "recent": "Последние темы",
"users": "Зарегистрированные пользователи", "users": "Зарегистрированные пользователи",
"notifications": "Уведомления", "notifications": "Уведомления",

@ -20,12 +20,14 @@
"flag": "Отметить", "flag": "Отметить",
"flag_title": "Отметить сообщение для модерирования", "flag_title": "Отметить сообщение для модерирования",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
"watch": "Watch",
"share_this_post": "Share this Post",
"thread_tools.title": "Опции Темы", "thread_tools.title": "Опции Темы",
"thread_tools.markAsUnreadForAll": "Отметить как непрочитанные", "thread_tools.markAsUnreadForAll": "Отметить как непрочитанные",
"thread_tools.pin": "Pin Topic", "thread_tools.pin": "Pin Topic",
"thread_tools.unpin": "Unpin Topic", "thread_tools.unpin": "Unpin Topic",
"thread_tools.lock": "Lock Topic", "thread_tools.lock": "Закрыть Тему",
"thread_tools.unlock": "Unlock Topic", "thread_tools.unlock": "Открыть Тему",
"thread_tools.move": "Move Topic", "thread_tools.move": "Move Topic",
"thread_tools.fork": "Fork Topic", "thread_tools.fork": "Fork Topic",
"thread_tools.delete": "Delete Topic", "thread_tools.delete": "Delete Topic",

@ -26,6 +26,7 @@
"edit": "Редактировать", "edit": "Редактировать",
"uploaded_picture": "Загруженные Фотографии", "uploaded_picture": "Загруженные Фотографии",
"upload_new_picture": "Загрузить новую фотографию", "upload_new_picture": "Загрузить новую фотографию",
"current_password": "Current Password",
"change_password": "Изменить Пароль", "change_password": "Изменить Пароль",
"confirm_password": "Подтвердите Пароль", "confirm_password": "Подтвердите Пароль",
"password": "Пароль", "password": "Пароль",

@ -10,11 +10,14 @@
"500.message": "Jejda, vyzerá, že sa niečo pokazilo.", "500.message": "Jejda, vyzerá, že sa niečo pokazilo.",
"register": "Registrovať", "register": "Registrovať",
"login": "Prihlásiť sa", "login": "Prihlásiť sa",
"welcome_back": "Vitaj naspäť",
"you_have_successfully_logged_in": "Úspešne si sa prihlásil",
"logout": "Odhlásiť sa", "logout": "Odhlásiť sa",
"logout.title": "Odhlásili sme Vás.", "logout.title": "Odhlásili sme Vás.",
"logout.message": "Úspešne sme Vás odhlásili z fóra.", "logout.message": "Úspešne sme Vás odhlásili z fóra.",
"save_changes": "Uložiť zmeny", "save_changes": "Uložiť zmeny",
"close": "Zrušiť", "close": "Zrušiť",
"pagination": "Stránkovanie",
"header.admin": "Administrácia", "header.admin": "Administrácia",
"header.recent": "Aktuality", "header.recent": "Aktuality",
"header.unread": "Neprečítané", "header.unread": "Neprečítané",
@ -48,5 +51,6 @@
"away": "Preč", "away": "Preč",
"dnd": "Nevyrušovať", "dnd": "Nevyrušovať",
"invisible": "Neviditeľný", "invisible": "Neviditeľný",
"offline": "Offline" "offline": "Offline",
"privacy": "Súkromie"
} }

@ -1,6 +1,7 @@
{ {
"home": "Home", "home": "Home",
"unread": "Unread Topics", "unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics", "recent": "Recent Topics",
"users": "Registered Users", "users": "Registered Users",
"notifications": "Notifications", "notifications": "Notifications",

@ -20,6 +20,8 @@
"flag": "Označiť", "flag": "Označiť",
"flag_title": "Označiť príspevok pre moderáciu", "flag_title": "Označiť príspevok pre moderáciu",
"deleted_message": "Toto vlákno bolo vymazané. Iba užívatelia s privilégiami ho môžu vidieť.", "deleted_message": "Toto vlákno bolo vymazané. Iba užívatelia s privilégiami ho môžu vidieť.",
"watch": "Sledovať",
"share_this_post": "Zdielaj tento príspevok",
"thread_tools.title": "Nástroje", "thread_tools.title": "Nástroje",
"thread_tools.markAsUnreadForAll": "Označ ako neprečítané", "thread_tools.markAsUnreadForAll": "Označ ako neprečítané",
"thread_tools.pin": "Zviditeľniť tému", "thread_tools.pin": "Zviditeľniť tému",

@ -20,18 +20,19 @@
"gravatar": "Gravatar", "gravatar": "Gravatar",
"birthday": "Dátum narodenia", "birthday": "Dátum narodenia",
"chat": "Chat", "chat": "Chat",
"follow": "Follow", "follow": "Nasleduj",
"unfollow": "Unfollow", "unfollow": "Nenasledovať",
"change_picture": "Zmeniť obrázok", "change_picture": "Zmeniť obrázok",
"edit": "Upraviť", "edit": "Upraviť",
"uploaded_picture": "Nahraný obrázok", "uploaded_picture": "Nahraný obrázok",
"upload_new_picture": "Nahrať nový obrázok", "upload_new_picture": "Nahrať nový obrázok",
"current_password": "Aktuálne heslo",
"change_password": "Zmeniť heslo", "change_password": "Zmeniť heslo",
"confirm_password": "Potvrdenie hesla", "confirm_password": "Potvrdenie hesla",
"password": "Heslo", "password": "Heslo",
"upload_picture": "Nahrať obrázok", "upload_picture": "Nahrať obrázok",
"upload_a_picture": "Nahrať obrázok", "upload_a_picture": "Nahrať obrázok",
"image_spec": "You may only upload PNG, JPG, or GIF files", "image_spec": "Môžeš pridať len obrázky typu PNG, JPG alebo GIF",
"max": "max.", "max": "max.",
"settings": "Nastavenia", "settings": "Nastavenia",
"show_email": "Zobrazovať môj email v profile", "show_email": "Zobrazovať môj email v profile",
@ -40,7 +41,7 @@
"has_no_posts": "Tento používateľ ešte nespravil príspevok", "has_no_posts": "Tento používateľ ešte nespravil príspevok",
"email_hidden": "Skrytý email", "email_hidden": "Skrytý email",
"hidden": "skrytý", "hidden": "skrytý",
"paginate_description": "Paginate topics and posts instead of using infinite scroll.", "paginate_description": "Stránkuj témy a príspevky miesto používania nekonečného posúvania.",
"topics_per_page": "Topics per Page", "topics_per_page": "Témy na stranu",
"posts_per_page": "Posts per Page" "posts_per_page": "Príspevkov na stranu"
} }

@ -10,11 +10,14 @@
"500.message": "Hoppsan! Verkar som att något gått snett!", "500.message": "Hoppsan! Verkar som att något gått snett!",
"register": "Registrera", "register": "Registrera",
"login": "Logga in", "login": "Logga in",
"welcome_back": "Welcome Back ",
"you_have_successfully_logged_in": "You have successfully logged in",
"logout": "Logga ut", "logout": "Logga ut",
"logout.title": "Du är nu utloggad.", "logout.title": "Du är nu utloggad.",
"logout.message": "Du är nu utloggad från NodeBB.", "logout.message": "Du är nu utloggad från NodeBB.",
"save_changes": "Spara ändringar", "save_changes": "Spara ändringar",
"close": "Stäng", "close": "Stäng",
"pagination": "Pagination",
"header.admin": "Admin", "header.admin": "Admin",
"header.recent": "Senaste", "header.recent": "Senaste",
"header.unread": "Olästa", "header.unread": "Olästa",
@ -48,5 +51,6 @@
"away": "Borta", "away": "Borta",
"dnd": "Stör ej", "dnd": "Stör ej",
"invisible": "Osynlig", "invisible": "Osynlig",
"offline": "Offline" "offline": "Offline",
"privacy": "Privacy"
} }

@ -1,6 +1,7 @@
{ {
"home": "Hem", "home": "Hem",
"unread": "Olästa ämnen", "unread": "Olästa ämnen",
"popular": "Popular Topics",
"recent": "Senaste ämnena", "recent": "Senaste ämnena",
"users": "Registrerade användare", "users": "Registrerade användare",
"notifications": "Notiser", "notifications": "Notiser",

@ -20,6 +20,8 @@
"flag": "Rapportera", "flag": "Rapportera",
"flag_title": "Rapportera detta inlägg för granskning", "flag_title": "Rapportera detta inlägg för granskning",
"deleted_message": "Denna tråd har tagits bort. Endast användare med administrations-rättigheter kan se den.", "deleted_message": "Denna tråd har tagits bort. Endast användare med administrations-rättigheter kan se den.",
"watch": "Watch",
"share_this_post": "Share this Post",
"thread_tools.title": "Trådverktyg", "thread_tools.title": "Trådverktyg",
"thread_tools.markAsUnreadForAll": "Markera som oläst", "thread_tools.markAsUnreadForAll": "Markera som oläst",
"thread_tools.pin": "Fäst ämne", "thread_tools.pin": "Fäst ämne",

@ -26,6 +26,7 @@
"edit": "Ändra", "edit": "Ändra",
"uploaded_picture": "Uppladdad bild", "uploaded_picture": "Uppladdad bild",
"upload_new_picture": "Ladda upp ny bild", "upload_new_picture": "Ladda upp ny bild",
"current_password": "Current Password",
"change_password": "Ändra lösenord", "change_password": "Ändra lösenord",
"confirm_password": "Bekräfta lösenord", "confirm_password": "Bekräfta lösenord",
"password": "Lösenord", "password": "Lösenord",

@ -10,11 +10,14 @@
"500.message": "Ups! Bir şeyler ters gitti sanki!", "500.message": "Ups! Bir şeyler ters gitti sanki!",
"register": "Kayıt Ol", "register": "Kayıt Ol",
"login": "Giriş", "login": "Giriş",
"welcome_back": "Welcome Back ",
"you_have_successfully_logged_in": "You have successfully logged in",
"logout": ıkış", "logout": ıkış",
"logout.title": "Şimdi çıkış yaptınız.", "logout.title": "Şimdi çıkış yaptınız.",
"logout.message": "NodeBB 'ye başarıyla giriş yaptınız", "logout.message": "NodeBB 'ye başarıyla giriş yaptınız",
"save_changes": "Değişiklikleri kaydet", "save_changes": "Değişiklikleri kaydet",
"close": "Yakın", "close": "Yakın",
"pagination": "Pagination",
"header.admin": "Yönetim", "header.admin": "Yönetim",
"header.recent": "Yeni", "header.recent": "Yeni",
"header.unread": "Okunmamış", "header.unread": "Okunmamış",
@ -48,5 +51,6 @@
"away": "Dışarıda", "away": "Dışarıda",
"dnd": "Rahatsız Etmeyin", "dnd": "Rahatsız Etmeyin",
"invisible": "Görünmez", "invisible": "Görünmez",
"offline": "Çevrimdışı" "offline": "Çevrimdışı",
"privacy": "Privacy"
} }

@ -1,6 +1,7 @@
{ {
"home": "Ana Sayfa", "home": "Ana Sayfa",
"unread": "Okunmayan Başlıklar", "unread": "Okunmayan Başlıklar",
"popular": "Popular Topics",
"recent": "Güncel Konular", "recent": "Güncel Konular",
"users": "Kayıtlı Kullanıcılar", "users": "Kayıtlı Kullanıcılar",
"notifications": "Bildirimler", "notifications": "Bildirimler",

@ -20,6 +20,8 @@
"flag": "Bayrak", "flag": "Bayrak",
"flag_title": "Bu iletiyi moderatöre haber et", "flag_title": "Bu iletiyi moderatöre haber et",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
"watch": "Watch",
"share_this_post": "Share this Post",
"thread_tools.title": "Seçenekler", "thread_tools.title": "Seçenekler",
"thread_tools.markAsUnreadForAll": "Okunmadı Olarak İşaretle", "thread_tools.markAsUnreadForAll": "Okunmadı Olarak İşaretle",
"thread_tools.pin": "Pin Topic", "thread_tools.pin": "Pin Topic",

@ -26,6 +26,7 @@
"edit": "Düzenle", "edit": "Düzenle",
"uploaded_picture": "Yüklenmiş Fotoğraflar", "uploaded_picture": "Yüklenmiş Fotoğraflar",
"upload_new_picture": "Yeni bir resim Yükle", "upload_new_picture": "Yeni bir resim Yükle",
"current_password": "Current Password",
"change_password": "Şifre Değiştir", "change_password": "Şifre Değiştir",
"confirm_password": "Şifreyi Onayla", "confirm_password": "Şifreyi Onayla",
"password": "Şifre", "password": "Şifre",

@ -10,11 +10,14 @@
"500.message": "不好!看来是哪里出错了!", "500.message": "不好!看来是哪里出错了!",
"register": "注册", "register": "注册",
"login": "登录", "login": "登录",
"welcome_back": "欢迎回来",
"you_have_successfully_logged_in": "You have successfully logged in",
"logout": "退出", "logout": "退出",
"logout.title": "你已经退出。", "logout.title": "你已经退出。",
"logout.message": "你已经成功退出登录。", "logout.message": "你已经成功退出登录。",
"save_changes": "保存修改", "save_changes": "保存修改",
"close": "关闭", "close": "关闭",
"pagination": "Pagination",
"header.admin": "管理", "header.admin": "管理",
"header.recent": "最近", "header.recent": "最近",
"header.unread": "未读", "header.unread": "未读",
@ -48,5 +51,6 @@
"away": "Away", "away": "Away",
"dnd": "Do not Disturb", "dnd": "Do not Disturb",
"invisible": "Invisible", "invisible": "Invisible",
"offline": "Offline" "offline": "Offline",
"privacy": "Privacy"
} }

@ -6,5 +6,5 @@
"forgot_password": "忘记密码?", "forgot_password": "忘记密码?",
"alternative_logins": "其他登录方式", "alternative_logins": "其他登录方式",
"failed_login_attempt": "登录失败,请再尝试。", "failed_login_attempt": "登录失败,请再尝试。",
"login_successful": "你已成功登录!" "login_successful": "您已经成功登录!"
} }

@ -1,6 +1,7 @@
{ {
"home": "Home", "home": "Home",
"unread": "Unread Topics", "unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics", "recent": "Recent Topics",
"users": "Registered Users", "users": "Registered Users",
"notifications": "Notifications", "notifications": "Notifications",

@ -20,6 +20,8 @@
"flag": "Flag", "flag": "Flag",
"flag_title": "Flag this post for moderation", "flag_title": "Flag this post for moderation",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
"watch": "Watch",
"share_this_post": "Share this Post",
"thread_tools.title": "管理工具", "thread_tools.title": "管理工具",
"thread_tools.markAsUnreadForAll": "Mark Unread", "thread_tools.markAsUnreadForAll": "Mark Unread",
"thread_tools.pin": "Pin Topic", "thread_tools.pin": "Pin Topic",

@ -1,46 +1,47 @@
{ {
"banned": "封禁", "banned": "封禁",
"offline": "线", "offline": "线",
"username": "用户名", "username": "用户名",
"email": "Email", "email": "邮件",
"fullname": "姓名", "fullname": "姓名",
"website": "网站", "website": "网站",
"location": "地址", "location": "地址",
"age": "年龄", "age": "年龄",
"joined": "加入时间", "joined": "加入时间",
"lastonline": "最后在线", "lastonline": "最后在线",
"profile": "Profile", "profile": "资料",
"profile_views": "资料被查看", "profile_views": "资料被查看",
"reputation": "声望", "reputation": "声望",
"posts": "发帖数", "posts": "发帖数",
"favourites": "Favourites", "favourites": "收藏的帖子",
"followers": "被关注", "followers": "被关注",
"following": "关注", "following": "关注",
"signature": "签名", "signature": "签名",
"gravatar": "Gravatar头像", "gravatar": "Gravatar头像",
"birthday": "生日", "birthday": "生日",
"chat": "Chat", "chat": "聊天",
"follow": "Follow", "follow": "关注",
"unfollow": "Unfollow", "unfollow": "取消关注",
"change_picture": "改变头像", "change_picture": "改变头像",
"edit": "编辑", "edit": "编辑",
"uploaded_picture": "已有头像", "uploaded_picture": "已有头像",
"upload_new_picture": "上传新头像", "upload_new_picture": "上传新头像",
"current_password": "当前密码",
"change_password": "更改密码", "change_password": "更改密码",
"confirm_password": "确认密码", "confirm_password": "确认密码",
"password": "密码", "password": "密码",
"upload_picture": "上传头像", "upload_picture": "上传头像",
"upload_a_picture": "上传一张照片", "upload_a_picture": "上传一张照片",
"image_spec": "You may only upload PNG, JPG, or GIF files", "image_spec": "您只能上传PNG,JPG或者是GIF图片文件",
"max": "max.", "max": "最大.",
"settings": "Settings", "settings": "设置",
"show_email": "显示我的邮箱", "show_email": "显示我的邮箱",
"has_no_follower": "该用户还没有被任何人关注。", "has_no_follower": "该用户还没有被任何人关注。",
"follows_no_one": "该用户还没有关注过任何人。", "follows_no_one": "该用户还没有关注过任何人。",
"has_no_posts": "This user didn't post anything yet.", "has_no_posts": "此用户还未发表过任何帖子.",
"email_hidden": "邮箱被隐藏", "email_hidden": "邮箱被隐藏",
"hidden": "隐藏", "hidden": "隐藏",
"paginate_description": "Paginate topics and posts instead of using infinite scroll.", "paginate_description": "使用分页方式显示话题和帖子,代替滚动显示",
"topics_per_page": "Topics per Page", "topics_per_page": "每页话题数量设置",
"posts_per_page": "Posts per Page" "posts_per_page": "每页帖子数量设置"
} }

@ -10,11 +10,14 @@
"500.message": "不好!看來是哪裡出錯了!", "500.message": "不好!看來是哪裡出錯了!",
"register": "注冊", "register": "注冊",
"login": "登錄", "login": "登錄",
"welcome_back": "Welcome Back ",
"you_have_successfully_logged_in": "You have successfully logged in",
"logout": "退出", "logout": "退出",
"logout.title": "你已經退出。", "logout.title": "你已經退出。",
"logout.message": "你已經成功退出登錄。", "logout.message": "你已經成功退出登錄。",
"save_changes": "保存修改", "save_changes": "保存修改",
"close": "關閉", "close": "關閉",
"pagination": "Pagination",
"header.admin": "管理", "header.admin": "管理",
"header.recent": "最近", "header.recent": "最近",
"header.unread": "未讀", "header.unread": "未讀",
@ -48,5 +51,6 @@
"away": "Away", "away": "Away",
"dnd": "Do not Disturb", "dnd": "Do not Disturb",
"invisible": "Invisible", "invisible": "Invisible",
"offline": "Offline" "offline": "Offline",
"privacy": "Privacy"
} }

@ -1,6 +1,7 @@
{ {
"home": "Home", "home": "Home",
"unread": "Unread Topics", "unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics", "recent": "Recent Topics",
"users": "Registered Users", "users": "Registered Users",
"notifications": "Notifications", "notifications": "Notifications",

@ -20,6 +20,8 @@
"flag": "Flag", "flag": "Flag",
"flag_title": "Flag this post for moderation", "flag_title": "Flag this post for moderation",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.", "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
"watch": "Watch",
"share_this_post": "Share this Post",
"thread_tools.title": "管理工具", "thread_tools.title": "管理工具",
"thread_tools.markAsUnreadForAll": "Mark Unread", "thread_tools.markAsUnreadForAll": "Mark Unread",
"thread_tools.pin": "Pin Topic", "thread_tools.pin": "Pin Topic",

@ -26,6 +26,7 @@
"edit": "編輯", "edit": "編輯",
"uploaded_picture": "已有頭像", "uploaded_picture": "已有頭像",
"upload_new_picture": "上傳新頭像", "upload_new_picture": "上傳新頭像",
"current_password": "Current Password",
"change_password": "更改密碼", "change_password": "更改密碼",
"confirm_password": "確認密碼", "confirm_password": "確認密碼",
"password": "密碼", "password": "密碼",

@ -65,7 +65,7 @@ var ajaxify = {};
} }
var hash = ''; var hash = '';
if(ajaxify.initialLoad && window.location.href.search(/#[0-9]+$/) !== -1) { if(ajaxify.initialLoad) {
hash = window.location.hash ? window.location.hash : ''; hash = window.location.hash ? window.location.hash : '';
} }
@ -97,7 +97,7 @@ var ajaxify = {};
templates.flush(); templates.flush();
templates.load_template(function () { templates.load_template(function () {
exec_body_scripts(content);
require(['forum/' + tpl_url], function(script) { require(['forum/' + tpl_url], function(script) {
if (script && script.init) { if (script && script.init) {
script.init(); script.init();
@ -172,56 +172,4 @@ var ajaxify = {};
}); });
}); });
function exec_body_scripts(body_el) {
// modified from http://stackoverflow.com/questions/2592092/executing-script-elements-inserted-with-innerhtml
function nodeName(elem, name) {
return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
}
function evalScript(elem) {
var data = (elem.text || elem.textContent || elem.innerHTML || ""),
head = document.getElementsByTagName("head")[0] ||
document.documentElement,
script = document.createElement("script");
script.type = "text/javascript";
try {
script.appendChild(document.createTextNode(data));
} catch (e) {
script.text = data;
}
if (elem.src) {
script.src = elem.src;
}
head.insertBefore(script, head.firstChild);
//TODO: remove from head before inserting?, doing this breaks scripts in safari so commented out for now
//head.removeChild(script);
}
var scripts = [],
script,
children_nodes = $(body_el).find('script'),
child,
i;
for (i = 0; children_nodes[i]; i++) {
child = children_nodes[i];
if (nodeName(child, "script") &&
(!child.type || child.type.toLowerCase() === "text/javascript")) {
scripts.push(child);
}
}
for (i = 0; scripts[i]; i++) {
script = scripts[i];
if (script.parentNode) {
script.parentNode.removeChild(script);
}
evalScript(scripts[i]);
}
}
}(jQuery)); }(jQuery));

@ -190,10 +190,11 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
$('#changePasswordBtn').on('click', function() { $('#changePasswordBtn').on('click', function() {
if (passwordvalid && passwordsmatch && currentPassword.val()) { if (passwordvalid && passwordsmatch && (currentPassword.val() || app.isAdmin)) {
socket.emit('user.changePassword', { socket.emit('user.changePassword', {
'currentPassword': currentPassword.val(), 'currentPassword': currentPassword.val(),
'newPassword': password.val() 'newPassword': password.val(),
'uid': templates.get('theirid')
}, function(err) { }, function(err) {
currentPassword.val(''); currentPassword.val('');
@ -203,12 +204,10 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
passwordvalid = false; passwordvalid = false;
if (err) { if (err) {
app.alertError(err.message); return app.alertError(err.message);
return;
} }
app.alertSuccess('Your password is updated!'); app.alertSuccess('Your password is updated!');
}); });
} }
return false; return false;

@ -83,7 +83,7 @@ define(['uploader'], function(uploader) {
var category = { var category = {
name: $('#inputName').val(), name: $('#inputName').val(),
description: $('#inputDescription').val(), description: $('#inputDescription').val(),
icon: $('#new-category-modal i').val(), icon: $('#new-category-modal i').attr('value'),
bgColor: '#0059b2', bgColor: '#0059b2',
color: '#fff', color: '#fff',
order: $('.admin-categories #entry-container').children().length + 1 order: $('.admin-categories #entry-container').children().length + 1
@ -105,10 +105,26 @@ define(['uploader'], function(uploader) {
var html = templates.prepare(templates['admin/categories'].blocks['categories']).parse({ var html = templates.prepare(templates['admin/categories'].blocks['categories']).parse({
categories: [data] categories: [data]
}); });
html = $(html);
html.find('[data-name="bgColor"], [data-name="color"]').each(enableColorPicker);
$('#entry-container').append(html); $('#entry-container').append(html);
$('#new-category-modal').modal('hide'); $('#new-category-modal').modal('hide');
});
}
function enableColorPicker(idx, inputEl) {
var jinputEl = $(inputEl),
previewEl = jinputEl.parents('[data-cid]').find('.preview-box');
jinputEl.ColorPicker({
color: jinputEl.val() || '#000',
onChange: function(hsb, hex) {
jinputEl.val('#' + hex);
if (inputEl.getAttribute('data-name') === 'bgColor') previewEl.css('background', '#' + hex);
else if (inputEl.getAttribute('data-name') === 'color') previewEl.css('color', '#' + hex);
modified(inputEl);
}
}); });
} }
@ -141,21 +157,12 @@ define(['uploader'], function(uploader) {
modified(ev.target); modified(ev.target);
}); });
$('.dropdown li[data-disabled]').each(function(index, element) {
var disabled = $(element).attr('data-disabled');
if (disabled == "0" || disabled == "") {
$(element).html('<a href="#"><i class="fa fa-power-off"></i> Disable</a>');
} else {
$(element).html('<a href="#"><i class="fa fa-power-off"></i> Enable</a>');
}
});
$('.dropdown').on('click', '[data-disabled]', function(ev) { $('.dropdown').on('click', '[data-disabled]', function(ev) {
var btn = $(this); var btn = $(this);
var categoryRow = btn.parents('li'); var categoryRow = btn.parents('li');
var cid = categoryRow.attr('data-cid'); var cid = categoryRow.attr('data-cid');
var disabled = this.getAttribute('data-disabled') === '0' ? '1' : '0'; var disabled = this.getAttribute('data-disabled') === 'false' ? '1' : '0';
categoryRow.remove(); categoryRow.remove();
modified_categories[cid] = modified_categories[cid] || {}; modified_categories[cid] = modified_categories[cid] || {};
modified_categories[cid]['disabled'] = disabled; modified_categories[cid]['disabled'] = disabled;
@ -165,20 +172,7 @@ define(['uploader'], function(uploader) {
}); });
// Colour Picker // Colour Picker
$('[data-name="bgColor"], [data-name="color"]').each(function(idx, inputEl) { $('[data-name="bgColor"], [data-name="color"]').each(enableColorPicker);
var jinputEl = $(this),
previewEl = jinputEl.parents('[data-cid]').find('.preview-box');
jinputEl.ColorPicker({
color: this.value || '#000',
onChange: function(hsb, hex) {
jinputEl.val('#' + hex);
if (inputEl.getAttribute('data-name') === 'bgColor') previewEl.css('background', '#' + hex);
else if (inputEl.getAttribute('data-name') === 'color') previewEl.css('color', '#' + hex);
modified(inputEl);
}
});
});
$('.admin-categories').on('click', '.save', save); $('.admin-categories').on('click', '.save', save);

@ -58,15 +58,14 @@ define(function() {
listEl.on('click', 'button[data-action]', function() { listEl.on('click', 'button[data-action]', function() {
var action = this.getAttribute('data-action'), var action = this.getAttribute('data-action'),
parent = $(this).parents('li[data-gid]'), gid = $(this).parents('li[data-gid]').attr('data-gid');
gid = parent.attr('data-gid'),
system = parseInt(parent.attr('data-system'), 10) === 1;
switch (action) { switch (action) {
case 'delete': case 'delete':
bootbox.confirm('Are you sure you wish to delete this group?', function(confirm) { bootbox.confirm('Are you sure you wish to delete this group?', function(confirm) {
if (confirm) { if (confirm) {
socket.emit('admin.groups.delete', gid, function(err, data) { socket.emit('admin.groups.delete', gid, function(err, data) {
console.log(err, data);
if(err) { if(err) {
return app.alertError(err.message); return app.alertError(err.message);
} }
@ -107,8 +106,6 @@ define(function() {
detailsModal.attr('data-gid', groupObj.gid); detailsModal.attr('data-gid', groupObj.gid);
detailsModal.modal('show'); detailsModal.modal('show');
$('.hide-if-system')[system ? 'hide' : 'show']();
}); });
break; break;
} }

@ -14,7 +14,23 @@ define(function() {
}, function() { }, function() {
window.location.href = RELATIVE_PATH + '/'; window.location.href = RELATIVE_PATH + '/';
}); });
}) });
$.get('https://api.github.com/repos/designcreateplay/NodeBB/tags', function(releases) {
var version = $('#version').html(),
latestVersion = releases[0].name.slice(1),
checkEl = $('.version-check');
checkEl.html($('.version-check').html().replace('<i class="fa fa-spinner fa-spin"></i>', 'v' + latestVersion));
// Alter box colour accordingly
if (latestVersion === version) {
checkEl.removeClass('alert-info').addClass('alert-success');
checkEl.append('<p>You are <strong>up-to-date</strong> <i class="fa fa-check"></i></p>');
} else if (latestVersion > version) {
checkEl.removeClass('alert-info').addClass('alert-danger');
checkEl.append('<p>A new version (v' + latestVersion + ') has been released. Consider upgrading your NodeBB.</p>');
}
});
}; };
Admin.updateRoomUsage = function(err, data) { Admin.updateRoomUsage = function(err, data) {

@ -21,6 +21,10 @@ define(['forum/recent'], function(recent) {
}); });
function loadMoreTopics() { function loadMoreTopics() {
if(!$('#topics-container').length) {
return;
}
loadingMoreTopics = true; loadingMoreTopics = true;
socket.emit('topics.loadMoreFromSet', { socket.emit('topics.loadMoreFromSet', {
set: 'topics:' + $('.nav-pills .active a').html().toLowerCase(), set: 'topics:' + $('.nav-pills .active a').html().toLowerCase(),

@ -92,6 +92,10 @@ define(function() {
} }
Recent.loadMoreTopics = function() { Recent.loadMoreTopics = function() {
if(!$('#topics-container').length) {
return;
}
loadingMoreTopics = true; loadingMoreTopics = true;
socket.emit('topics.loadMoreRecentTopics', { socket.emit('topics.loadMoreRecentTopics', {
after: $('#topics-container').attr('data-nextstart'), after: $('#topics-container').attr('data-nextstart'),

@ -290,8 +290,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
app.alert({ app.alert({
alert_id: 'topic_follow', alert_id: 'topic_follow',
timeout: 2500, timeout: 2500,
title: 'Following Topic', title: '[[topic:following_topic.title]]',
message: 'You will now be receiving notifications when somebody posts to this topic.', message: '[[topic:following_topic.message]]',
type: 'success' type: 'success'
}); });
} }
@ -302,8 +302,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
app.alert({ app.alert({
alert_id: 'topic_follow', alert_id: 'topic_follow',
timeout: 2500, timeout: 2500,
title: 'Not Following Topic', title: '[[topic:not_following_topic.title]]',
message: 'You will no longer receive notifications from this topic.', message: '[[topic:not_following_topic.message]]',
type: 'success' type: 'success'
}); });
} }
@ -320,8 +320,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
return app.alert({ return app.alert({
type: 'danger', type: 'danger',
alert_id: 'topic_follow', alert_id: 'topic_follow',
title: 'Please Log In', title: '[[global:please_log_in]]',
message: 'Please register or log in in order to subscribe to this topic', message: '[[topic:login_to_subscribe]]',
timeout: 5000 timeout: 5000
}); });
} }
@ -754,7 +754,6 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
} }
socket.emit('topics.markAsRead', {tid: tid, uid: app.uid}); socket.emit('topics.markAsRead', {tid: tid, uid: app.uid});
createNewPosts(data); createNewPosts(data);
}); });
@ -1138,21 +1137,19 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
var elTop = el.offset().top; var elTop = el.offset().top;
var height = Math.floor(el.height()); var height = Math.floor(el.height());
var elBottom = elTop + height; var elBottom = elTop + height;
return !(elTop > scrollBottom || elBottom < scrollTop);
return ((elBottom >= scrollTop) &&
(elTop <= scrollBottom) &&
(elBottom <= scrollBottom) &&
(elTop >= scrollTop));
} }
Topic.scrollToPost = function(pid, duration, offset) { Topic.scrollToPost = function(pid, duration, offset) {
if (!pid) { if (!pid) {
return; return;
} }
if(!offset) { if(!offset) {
offset = 0; offset = 0;
} }
if($('#post_anchor_' + pid).length) { if($('#post_anchor_' + pid).length) {
return scrollToPid(pid); return scrollToPid(pid);
} }
@ -1198,7 +1195,11 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
} }
if (tid && scrollTo.length) { if (tid && scrollTo.length) {
if($('#post-container li.post-row[data-pid="' + pid + '"]').attr('data-index') !== '0') {
animateScroll(); animateScroll();
} else {
updateHeader();
}
} }
} }
} }

@ -44,6 +44,9 @@ define(['forum/recent'], function(recent) {
}); });
function loadMoreTopics() { function loadMoreTopics() {
if(!$('#topics-container').length) {
return;
}
loadingMoreTopics = true; loadingMoreTopics = true;
socket.emit('topics.loadMoreUnreadTopics', { socket.emit('topics.loadMoreUnreadTopics', {
after: $('#topics-container').attr('data-nextstart') after: $('#topics-container').attr('data-nextstart')

@ -15,8 +15,8 @@ define(['taskbar'], function(taskbar) {
type: 'danger', type: 'danger',
timeout: 5000, timeout: 5000,
alert_id: 'post_error', alert_id: 'post_error',
title: 'Please Log In to Post', title: '[[global:please_log_in]]',
message: 'Posting is currently restricted to registered members only, click here to log in', message: '[[global:posting_restriction_info]]',
clickfn: function() { clickfn: function() {
ajaxify.go('login'); ajaxify.go('login');
} }
@ -192,8 +192,7 @@ define(['taskbar'], function(taskbar) {
clearForm: true, clearForm: true,
formData: formData, formData: formData,
error: function(xhr) { error: function(xhr) {
app.alertError('Error uploading file! ' + xhr.status); app.alertError('Error uploading file!\nStatus : ' + xhr.status + '\nMessage : ' + xhr.responseText);
composer.posts[post_uuid].uploadsInProgress.pop();
if (typeof callback == 'function') if (typeof callback == 'function')
callback(xhr); callback(xhr);
}, },
@ -214,10 +213,14 @@ define(['taskbar'], function(taskbar) {
} }
} }
composer.posts[post_uuid].uploadsInProgress.pop();
textarea.focus(); textarea.focus();
if (typeof callback == 'function') if (typeof callback == 'function')
callback(null, uploads); callback(null, uploads);
},
complete: function(xhr, status) {
uploadForm[0].reset();
composer.posts[post_uuid].uploadsInProgress.pop();
} }
}); });
@ -252,18 +255,17 @@ define(['taskbar'], function(taskbar) {
$(this).ajaxSubmit({ $(this).ajaxSubmit({
formData: formData, formData: formData,
error: function(xhr) { error: function(xhr) {
app.alertError('Error uploading file! ' + xhr.status); app.alertError('Error uploading file!\nStatus : ' + xhr.status + '\nMessage : ' + xhr.responseText);
composer.posts[post_uuid].uploadsInProgress.pop();
if (typeof callback == 'function') if (typeof callback == 'function')
callback(xhr); callback(xhr);
}, },
success: function(uploads) { success: function(uploads) {
composer.posts[post_uuid].uploadsInProgress.pop();
postContainer.find('#topic-thumb-url').val((uploads[0] || {}).url || '').trigger('change'); postContainer.find('#topic-thumb-url').val((uploads[0] || {}).url || '').trigger('change');
if (typeof callback == 'function') if (typeof callback == 'function')
callback(null, uploads); callback(null, uploads);
}, },
complete: function(){ complete: function() {
composer.posts[post_uuid].uploadsInProgress.pop();
spinner.addClass('hide'); spinner.addClass('hide');
} }
}); });
@ -477,7 +479,12 @@ define(['taskbar'], function(taskbar) {
case 'fa fa-bold': case 'fa fa-bold':
if (selectionStart === selectionEnd) { if (selectionStart === selectionEnd) {
// Nothing selected // Nothing selected
var cursorPos = postContentEl[0].selectionStart;
insertIntoInput(postContentEl, "**bolded text**"); insertIntoInput(postContentEl, "**bolded text**");
// Highlight "link url"
postContentEl[0].selectionStart = cursorPos + 12;
postContentEl[0].selectionEnd = cursorPos + 20;
} else { } else {
// Text selected // Text selected
postContentEl.val(postContentEl.val().slice(0, selectionStart) + '**' + postContentEl.val().slice(selectionStart, selectionEnd) + '**' + postContentEl.val().slice(selectionEnd)); postContentEl.val(postContentEl.val().slice(0, selectionStart) + '**' + postContentEl.val().slice(selectionStart, selectionEnd) + '**' + postContentEl.val().slice(selectionEnd));
@ -503,7 +510,12 @@ define(['taskbar'], function(taskbar) {
case 'fa fa-link': case 'fa fa-link':
if (selectionStart === selectionEnd) { if (selectionStart === selectionEnd) {
// Nothing selected // Nothing selected
var cursorPos = postContentEl[0].selectionStart;
insertIntoInput(postContentEl, "[link text](link url)"); insertIntoInput(postContentEl, "[link text](link url)");
// Highlight "link url"
postContentEl[0].selectionStart = cursorPos + 12;
postContentEl[0].selectionEnd = cursorPos + 20;
} else { } else {
// Text selected // Text selected
postContentEl.val(postContentEl.val().slice(0, selectionStart) + '[' + postContentEl.val().slice(selectionStart, selectionEnd) + '](link url)' + postContentEl.val().slice(selectionEnd)); postContentEl.val(postContentEl.val().slice(0, selectionStart) + '[' + postContentEl.val().slice(selectionStart, selectionEnd) + '](link url)' + postContentEl.val().slice(selectionEnd));
@ -760,6 +772,155 @@ define(['taskbar'], function(taskbar) {
taskbar.minimize('composer', post_uuid); taskbar.minimize('composer', post_uuid);
}; };
function initializeDragAndDrop(post_uuid) {
if(jQuery.event.props.indexOf('dataTransfer') === -1) {
jQuery.event.props.push('dataTransfer');
}
var draggingDocument = false;
var postContainer = $('#cmp-uuid-' + post_uuid),
fileForm = postContainer.find('#fileForm');
drop = postContainer.find('.imagedrop'),
tabContent = postContainer.find('.tab-content'),
textarea = postContainer.find('textarea');
$(document).off('dragstart').on('dragstart', function(e) {
draggingDocument = true;
}).off('dragend').on('dragend', function(e) {
draggingDocument = false;
});
textarea.on('dragenter', function(e) {
if(draggingDocument) {
return;
}
drop.css('top', tabContent.position().top + 'px');
drop.css('height', textarea.height());
drop.css('line-height', textarea.height() + 'px');
drop.show();
drop.on('dragleave', function(ev) {
drop.hide();
drop.off('dragleave');
});
});
function cancel(e) {
e.preventDefault();
return false;
}
drop.on('dragover', cancel);
drop.on('dragenter', cancel);
drop.on('drop', function(e) {
e.preventDefault();
var dt = e.dataTransfer,
files = dt.files;
if(files.length) {
var fd = new FormData();
for (var i = 0, file; file = dt.files[i]; i++) {
fd.append('files[]', file, file.name);
}
fileForm[0].reset();
uploadSubmit(files, post_uuid, '/api/post/upload', fd);
}
drop.hide();
return false;
});
$(window).off('paste').on('paste', function(event) {
var items = (event.clipboardData || event.originalEvent.clipboardData).items;
if(items && items.length) {
var blob = items[0].getAsFile();
if(blob) {
blob.name = 'upload-'+ utils.generateUUID();
var fd = new FormData();
fd.append('files[]', blob, blob.name);
fileForm[0].reset();
uploadSubmit([blob], post_uuid, '/api/post/upload', fd);
}
}
});
}
function uploadSubmit(files, post_uuid, route, formData, callback) {
var postContainer = $('#cmp-uuid-' + post_uuid),
textarea = postContainer.find('textarea'),
text = textarea.val(),
uploadForm = postContainer.find('#fileForm');
uploadForm.attr('action', route);
for(var i=0; i<files.length; ++i) {
var isImage = files[i].type.match('image.*');
text += (isImage ? '!' : '') + '[' + files[i].name + '](uploading...) ';
if(files[i].size > parseInt(config.maximumFileSize, 10) * 1024) {
uploadForm[0].reset();
return composerAlert('File too big', 'Maximum allowed file size is ' + config.maximumFileSize + 'kbs');
}
}
textarea.val(text);
uploadForm.off('submit').submit(function() {
$(this).find('#postUploadCsrf').val($('#csrf_token').val());
if(formData) {
formData.append('_csrf', $('#csrf_token').val());
}
composer.posts[post_uuid].uploadsInProgress.push(1);
$(this).ajaxSubmit({
resetForm: true,
clearForm: true,
formData: formData,
error: function(xhr) {
app.alertError('Error uploading file!\nStatus : ' + xhr.status + '\nMessage : ' + xhr.responseText);
},
uploadProgress: function(event, position, total, percent) {
var current = textarea.val();
for(var i=0; i<files.length; ++i) {
var re = new RegExp(files[i].name + "]\\([^)]+\\)", 'g');
textarea.val(current.replace(re, files[i].name+'](uploading ' + percent + '%)'));
}
},
success: function(uploads) {
if(uploads && uploads.length) {
for(var i=0; i<uploads.length; ++i) {
var current = textarea.val();
var re = new RegExp(uploads[i].name + "]\\([^)]+\\)", 'g');
textarea.val(current.replace(re, uploads[i].name + '](' + uploads[i].url + ')'));
}
}
textarea.focus();
},
complete: function(xhr, status) {
uploadForm[0].reset();
composer.posts[post_uuid].uploadsInProgress.pop();
}
});
return false;
});
uploadForm.submit();
}
return { return {
newTopic: composer.newTopic, newTopic: composer.newTopic,
newReply: composer.newReply, newReply: composer.newReply,

@ -17,17 +17,17 @@ define(function() {
numUnread = data.unread.length, numUnread = data.unread.length,
x; x;
notifList.html(''); var html = '';
if (!err && (data.read.length + data.unread.length) > 0) { if (!err && (data.read.length + data.unread.length) > 0) {
var image = ''; var image = '';
for (x = 0; x < numUnread; x++) { for (x = 0; x < numUnread; x++) {
if (data.unread[x].image) { if (data.unread[x].image) {
image = '<img src="' + data.unread[x].image + '" />'; image = '<img class="image" src="' + data.unread[x].image + '" />';
} else { } else {
image = ''; image = '';
} }
notifList.append($('<li class="' + data.unread[x].readClass + '"><a href="' + data.unread[x].path + '">' + image + '<span class="pull-right relTime">' + utils.relativeTime(data.unread[x].datetime, true) + '</span><span class="text">' + data.unread[x].text + '</span></a></li>')); html += '<li class="' + (data.unread[x].readClass || '') + '"><a href="' + data.unread[x].path + '">' + image + '<span class="pull-right relTime">' + utils.relativeTime(data.unread[x].datetime, true) + '</span><span class="text">' + data.unread[x].text + '</span></a></li>';
} }
for (x = 0; x < numRead; x++) { for (x = 0; x < numRead; x++) {
@ -36,18 +36,27 @@ define(function() {
} else { } else {
image = ''; image = '';
} }
notifList.append($('<li class="' + data.read[x].readClass + '"><a href="' + data.read[x].path + '">' + image + '<span class="pull-right relTime">' + utils.relativeTime(data.read[x].datetime, true) + '</span><span class="text">' + data.read[x].text + '</span></a></li>')); html += '<li class="' + data.read[x].readClass + '"><a href="' + data.read[x].path + '">' + image + '<span class="pull-right relTime">' + utils.relativeTime(data.read[x].datetime, true) + '</span><span class="text">' + data.read[x].text + '</span></a></li>';
} }
addSeeAllLink(replaceHtml);
} else { } else {
translator.translate('<li class="no-notifs"><a>[[notifications:no_notifs]]</a></li>', function(translated) { translator.translate('<li class="no-notifs"><a>[[notifications:no_notifs]]</a></li>', function(translated) {
notifList.append($(translated)); html += translated;
addSeeAllLink(replaceHtml);
}); });
} }
function addSeeAllLink(callback) {
translator.translate('<li class="pagelink"><a href="' + RELATIVE_PATH + '/notifications">[[notifications:see_all]]</a></li>', function(translated) { translator.translate('<li class="pagelink"><a href="' + RELATIVE_PATH + '/notifications">[[notifications:see_all]]</a></li>', function(translated) {
notifList.append($(translated)); html += translated;
callback();
}); });
}
function replaceHtml() {
notifList.html(html);
}
updateNotifCount(data.unread.length); updateNotifCount(data.unread.length);

@ -100,7 +100,13 @@
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li class="permissions"><a href="#"><i class="fa fa-ban"></i> Access Control</a></li> <li class="permissions"><a href="#"><i class="fa fa-ban"></i> Access Control</a></li>
<hr /> <hr />
<li data-disabled="{categories.disabled}"><a href="#"></a></li> <li data-disabled="{categories.disabled}">
<!-- IF categories.disabled -->
<a href="#"><i class="fa fa-power-off"></i> Enable</a>
<!-- ELSE -->
<a href="#"><i class="fa fa-power-off"></i> Disable</a>
<!-- ENDIF categories.disabled -->
</li>
</ul> </ul>
<button type="button" data-name="image" data-value="{categories.image}" class="btn btn-default upload-button"><i class="fa fa-upload"></i> Image</button> <button type="button" data-name="image" data-value="{categories.image}" class="btn btn-default upload-button"><i class="fa fa-upload"></i> Image</button>

@ -5,17 +5,17 @@
<div class="groups"> <div class="groups">
<ul id="groups-list"> <ul id="groups-list">
<!-- BEGIN groups --> <!-- BEGIN groups -->
<li data-gid="{groups.gid}" data-system="{groups.hidden}"> <li data-gid="{groups.gid}">
<div class="row"> <div class="row">
<div class="col-lg-8"> <div class="col-lg-8">
<h2>{groups.name}</h2> <h2>{groups.name}</h2>
<p>{groups.description}</p> <p>{groups.description}</p>
<!-- IF groups.deletable -->
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-default" data-action="members">Members</button> <button class="btn btn-default" data-action="members">Members</button>
<!-- IF groups.deletable -->
<button class="btn btn-danger" data-action="delete">Delete Group</button> <button class="btn btn-danger" data-action="delete">Delete Group</button>
<!-- ENDIF groups.deletable -->
</div> </div>
<!-- ENDIF groups.deletable -->
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<ul class="pull-right members"> <ul class="pull-right members">
@ -69,7 +69,7 @@
<div class="modal-body"> <div class="modal-body">
<div class="alert alert-danger hide" id="create-modal-error"></div> <div class="alert alert-danger hide" id="create-modal-error"></div>
<form> <form>
<div class="form-group hide-if-system"> <div class="form-group">
<label for="group-name">Group Name</label> <label for="group-name">Group Name</label>
<input type="text" class="form-control" id="change-group-name" placeholder="Group Name" /> <input type="text" class="form-control" id="change-group-name" placeholder="Group Name" />
</div> </div>

@ -1,20 +1,36 @@
<div class="home">
<div class="jumbotron"> <div class="col-sm-6">
<h1>Welcome to NodeBB</h1> <div class="panel panel-default">
<br /> <div class="panel-heading">Welcome to NodeBB</div>
<div class="panel-body">
<p> <p>
<a target="_blank" href="http://community.nodebb.org" class="btn btn-default btn-lg"><i class="fa fa-comment"></i> NodeBB Community Forum</a> <a target="_blank" href="http://community.nodebb.org" class="btn btn-default btn-sm"><i class="fa fa-comment"></i> NodeBB Community Forum</a>
<a target="_blank" href="http://community.nodebb.org/" class="btn btn-default btn-lg"><i class="fa fa-github-alt"></i> Get Plugins and Themes</a> <a target="_blank" href="http://community.nodebb.org/" class="btn btn-default btn-sm"><i class="fa fa-github-alt"></i> Get Plugins and Themes</a>
<a target="_blank" href="http://www.twitter.com/NodeBB" class="btn btn-default btn-lg"><i class="fa fa-twitter"></i> Follow @NodeBB</a> <a target="_blank" href="http://www.twitter.com/NodeBB" class="btn btn-default btn-sm"><i class="fa fa-twitter"></i> Follow @NodeBB</a>
<a target="_blank" href="https://github.com/designcreateplay/NodeBB/wiki" class="btn btn-default btn-lg"><i class="fa fa-question-circle"></i> NodeBB Wiki</a> <a target="_blank" href="https://github.com/designcreateplay/NodeBB/wiki" class="btn btn-default btn-sm"><i class="fa fa-question-circle"></i> NodeBB Wiki</a>
</p> </p>
<p><small>You are running <strong>NodeBB v{version}</strong>. Always make sure that your <strong>NodeBB</strong> is up to date for the latest security patches and bug fixes.</small></p> </div>
</div> </div>
</div>
<div class="col-sm-6 pull-right">
<div class=""> <div class="panel panel-default">
<h2>Active Users <small><span class="badge" id="connections"></span> socket connections</small></h2> <div class="panel-heading">Updates</div>
<p id="active_users"> <div class="panel-body">
<div class="alert alert-info version-check">
<p>You are running <strong>NodeBB v<span id="version">{version}</span></strong>.</p>
</div>
<p>
Always make sure that your <strong>NodeBB</strong> is up to date for the latest security patches and bug fixes.
</p> </p>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">Active Users <small><span class="badge" id="connections"></span> socket connections</small></div>
<div class="panel-body">
<div id="active_users"></div>
</div>
</div>
</div>
</div> </div>

@ -6,7 +6,7 @@
In NodeBB, the MOTD is present at the top of the forum homepage, and can be customized much like a header. In NodeBB, the MOTD is present at the top of the forum homepage, and can be customized much like a header.
</p> </p>
<p> <p>
You can enter either full HTML or Markdown text. You can enter full HTML/Javascript.
</p> </p>
<br /> <br />
<textarea class="form-control" placeholder="Welcome to NodeBB!" data-field="motd" rows="10"></textarea> <textarea class="form-control" placeholder="Welcome to NodeBB!" data-field="motd" rows="10"></textarea>

@ -93,6 +93,11 @@
<input type="checkbox" data-field="allowRegistration" checked> <strong>Allow registration</strong> <input type="checkbox" data-field="allowRegistration" checked> <strong>Allow registration</strong>
</label> </label>
</div> </div>
<div class="checkbox">
<label>
<input type="checkbox" data-field="privateUserInfo"> <strong>Make user info private</strong>
</label>
</div>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" data-field="disableSignatures"> <strong>Disable signatures</strong> <input type="checkbox" data-field="disableSignatures"> <strong>Disable signatures</strong>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save