Merge remote-tracking branch 'origin/master' into develop

v1.18.x
Julian Lam 8 years ago
commit f58107e40a

@ -51,7 +51,7 @@
"morgan": "^1.3.2", "morgan": "^1.3.2",
"mousetrap": "^1.5.3", "mousetrap": "^1.5.3",
"nconf": "~0.8.2", "nconf": "~0.8.2",
"nodebb-plugin-composer-default": "4.3.5", "nodebb-plugin-composer-default": "4.3.6",
"nodebb-plugin-dbsearch": "1.0.4", "nodebb-plugin-dbsearch": "1.0.4",
"nodebb-plugin-emoji-extended": "1.1.1", "nodebb-plugin-emoji-extended": "1.1.1",
"nodebb-plugin-emoji-one": "1.1.5", "nodebb-plugin-emoji-one": "1.1.5",
@ -86,7 +86,7 @@
"socket.io-redis": "2.0.0", "socket.io-redis": "2.0.0",
"socketio-wildcard": "~0.3.0", "socketio-wildcard": "~0.3.0",
"string": "^3.0.0", "string": "^3.0.0",
"templates.js": "0.3.5", "templates.js": "0.3.6",
"toobusy-js": "^0.5.1", "toobusy-js": "^0.5.1",
"uglify-js": "^2.6.0", "uglify-js": "^2.6.0",
"underscore": "^1.8.3", "underscore": "^1.8.3",

@ -14,7 +14,7 @@
"dev-interested": "Interested in writing plugins for NodeBB?", "dev-interested": "Interested in writing plugins for NodeBB?",
"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.", "docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.", "order.description": "Certain plugins work ideally when they are initialized before/after other plugins.",
"order.explanation": "Plugins load in the order specified here, from top to bottom", "order.explanation": "Plugins load in the order specified here, from top to bottom",
"plugin-item.themes": "Themes", "plugin-item.themes": "Themes",

@ -1,7 +1,7 @@
{ {
"none": "Your forum does not have any topics with tags yet.", "none": "Your forum does not have any topics with tags yet.",
"bg-color": "Background Colour", "bg-color": "Background Color",
"text-color": "Text Colour", "text-color": "Text Color",
"create-modify": "Create & Modify Tags", "create-modify": "Create & Modify Tags",
"description": "Select tags via clicking and/or dragging, use shift to select multiple.", "description": "Select tags via clicking and/or dragging, use shift to select multiple.",
"create": "Create Tag", "create": "Create Tag",

@ -21,7 +21,7 @@
"restrictions.stale-help": "If a topic is considered \"stale\", then a warning will be shown to users who attempt to reply to that topic.", "restrictions.stale-help": "If a topic is considered \"stale\", then a warning will be shown to users who attempt to reply to that topic.",
"timestamp": "Timestamp", "timestamp": "Timestamp",
"timestamp.cut-off": "Date cut-off (in days)", "timestamp.cut-off": "Date cut-off (in days)",
"timestamp.cut-off-help": "Dates &amp; times will be shown in a relative manner (e.g. \"3 hours ago\" / \"5 days ago\"), and localised into various\n\t\t\t\t\tlanguages. After a certain point, this text can be switched to display the localised date itself\n\t\t\t\t\t(e.g. 5 Nov 2016 15:30).<br /><em>(Default: <code>30</code>, or one month). Set to 0 to always display dates, leave blank to always display relative times.</em>", "timestamp.cut-off-help": "Dates &amp; times will be shown in a relative manner (e.g. \"3 hours ago\" / \"5 days ago\"), and localised into various\n\\t\\t\\t\\t\\tlanguages. After a certain point, this text can be switched to display the localised date itself\n\\t\\t\\t\\t\\t(e.g. 5 Nov 2016 15:30).<br /><em>(Default: <code>30</code>, or one month). Set to 0 to always display dates, leave blank to always display relative times.</em>",
"teaser": "Teaser Post", "teaser": "Teaser Post",
"teaser.last-post": "Last &ndash; Show the latest post, including the original post, if no replies", "teaser.last-post": "Last &ndash; Show the latest post, including the original post, if no replies",
"teaser.last-reply": "Last &ndash; Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.last-reply": "Last &ndash; Show the latest reply, or a \"No replies\" placeholder if no replies",
@ -35,7 +35,7 @@
"signature.no-images": "Disable images in signatures", "signature.no-images": "Disable images in signatures",
"signature.max-length": "Maximum Signature Length", "signature.max-length": "Maximum Signature Length",
"composer": "Composer Settings", "composer": "Composer Settings",
"composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\\t\\t\\t\\tto users when they create new topics, or reply to existing topics.",
"composer.show-help": "Show \"Help\" tab", "composer.show-help": "Show \"Help\" tab",
"composer.enable-plugin-help": "Allow plugins to add content to the help tab", "composer.enable-plugin-help": "Allow plugins to add content to the help tab",
"composer.custom-help": "Custom Help Text", "composer.custom-help": "Custom Help Text",

@ -9,7 +9,7 @@
"allow-topic-thumbnails": "Allow users to upload topic thumbnails", "allow-topic-thumbnails": "Allow users to upload topic thumbnails",
"topic-thumb-size": "Topic Thumb Size", "topic-thumb-size": "Topic Thumb Size",
"allowed-file-extensions": "Allowed File Extensions", "allowed-file-extensions": "Allowed File Extensions",
"allowed-file-extensions-help": "Enter comma-separated list of file extensions here (e.g. <code>pdf,xls,doc</code>).\n\t\t\t\t\tAn empty list means all extensions are allowed.", "allowed-file-extensions-help": "Enter comma-separated list of file extensions here (e.g. <code>pdf,xls,doc</code>).\n\\t\\t\\t\\t\\tAn empty list means all extensions are allowed.",
"profile-avatars": "Profile Avatars", "profile-avatars": "Profile Avatars",
"allow-profile-image-uploads": "Allow users to upload profile images", "allow-profile-image-uploads": "Allow users to upload profile images",
"convert-profile-image-png": "Convert profile image uploads to PNG", "convert-profile-image-png": "Convert profile image uploads to PNG",

@ -1,11 +1,11 @@
{ {
"post-cache": "Post Cache", "post-cache": "Publicar Cache",
"posts-in-cache": "Posts in Cache", "posts-in-cache": "Publicar en Cache",
"average-post-size": "Average Post Size", "average-post-size": "Tamaño medio de post",
"length-to-max": "Length / Max", "length-to-max": "Longitud / Maxima",
"percent-full": "%1% Full", "percent-full": "%1% Completo",
"post-cache-size": "Post Cache Size", "post-cache-size": "Tamaño de cache del post",
"items-in-cache": "Items in Cache", "items-in-cache": "Artículos en cache",
"control-panel": "Control Panel", "control-panel": "Panel de Control",
"update-settings": "Update Cache Settings" "update-settings": "Actualizar opciones de cache"
} }

@ -1,14 +1,14 @@
{ {
"figure-x": "Figura %1", "figure-x": "Figura %1",
"error-events-per-day": "<code>%1</code> events per day", "error-events-per-day": "<code>%1</code> eventos por dia",
"error.404": "404 No Encontrado", "error.404": "404 No Encontrado",
"error.503": "503 Servicio no disponible", "error.503": "503 Servicio no disponible",
"manage-error-log": "Manage Error Log", "manage-error-log": "Administrar registro de errores",
"export-error-log": "Export Error Log (CSV)", "export-error-log": "Exportar registro de errores (CSV)",
"clear-error-log": "Cerrar Log de Error", "clear-error-log": "Cerrar Log de Error",
"route": "Route", "route": "Ruta",
"count": "Count", "count": "Contar",
"no-routes-not-found": "Hooray! There are no routes that were not found.", "no-routes-not-found": "Hurra! No hay rutas rutas que no fueran encontradas.",
"clear404-confirm": "Are you sure you wish to clear the 404 error logs?", "clear404-confirm": "¿Estas seguro que desea borrar los registros de errores 404?",
"clear404-success": "\"404 Not Found\" errors cleared" "clear404-success": "\"404 no encontrado\" Errores borrados"
} }

@ -1,6 +1,6 @@
{ {
"events": "Events", "events": "Eventos",
"no-events": "There are no events", "no-events": "No hay eventos",
"control-panel": "Events Control Panel", "control-panel": "Panel de control de eventos",
"delete-events": "Delete Events" "delete-events": "Borrar eventos"
} }

@ -1,7 +1,7 @@
{ {
"logs": "Logs", "logs": "Registro",
"control-panel": "Logs Control Panel", "control-panel": "Panel de control del registro",
"reload": "Reload Logs", "reload": "Recargar registro",
"clear": "Clear Logs", "clear": "Borrar registro",
"clear-success": "Logs Cleared!" "clear-success": "¡Registros borrados!"
} }

@ -1,9 +1,9 @@
{ {
"custom-css": "Custom CSS", "custom-css": "CSS personalizado",
"custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", "custom-css.description": "Introduce tus propias declaraciones CSS aquí, las cuales serán aplicadas después de otros estilos.",
"custom-css.enable": "Enable Custom CSS", "custom-css.enable": "Activar CSS personalizado",
"custom-header": "Custom Header", "custom-header": "Cabezera personalizada",
"custom-header.description": "Enter custom HTML here (ex. JavaScript, Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup.", "custom-header.description": "Introduce HTML personalizado aquí (ej. JavaScript, Meta Etiquetas, etc.), el cual se adjuntará a la sección <code>&lt;head&gt;</code> del código de su foro.",
"custom-header.enable": "Enable Custom Header" "custom-header.enable": "Activar cabecera personalizada"
} }

@ -1,75 +1,75 @@
{ {
"section-general": "General", "section-general": "General",
"general/dashboard": "Dashboard", "general/dashboard": "Panel",
"general/homepage": "Home Page", "general/homepage": "Página Inicial",
"general/navigation": "Navigation", "general/navigation": "Navegación",
"general/languages": "Languages", "general/languages": "Lenguajes",
"general/sounds": "Sounds", "general/sounds": "Sonidos",
"general/social": "Social", "general/social": "Social",
"section-manage": "Manage", "section-manage": "Administrar",
"manage/categories": "Categories", "manage/categories": "Categorias",
"manage/tags": "Tags", "manage/tags": "Etiquetas",
"manage/users": "Users", "manage/users": "Usuarios",
"manage/registration": "Registration Queue", "manage/registration": "Cola de Registro",
"manage/groups": "Groups", "manage/groups": "Grupos",
"manage/flags": "Flags", "manage/flags": "Banderas",
"manage/ip-blacklist": "IP Blacklist", "manage/ip-blacklist": "Lista negra de IP",
"section-settings": "Settings", "section-settings": "Opciones",
"settings/general": "General", "settings/general": "General",
"settings/reputation": "Reputation", "settings/reputation": "Reputación",
"settings/email": "Email", "settings/email": "Email",
"settings/user": "User", "settings/user": "Usuario",
"settings/group": "Group", "settings/group": "Grupo",
"settings/guest": "Guests", "settings/guest": "Invitados",
"settings/uploads": "Uploads", "settings/uploads": "Subidas",
"settings/post": "Post", "settings/post": "Anuncio",
"settings/chat": "Chat", "settings/chat": "Chat",
"settings/pagination": "Pagination", "settings/pagination": "Paginación",
"settings/tags": "Tags", "settings/tags": "Etiquetas",
"settings/notifications": "Notifications", "settings/notifications": "Notificaciones",
"settings/cookies": "Cookies", "settings/cookies": "Cookies",
"settings/web-crawler": "Web Crawler", "settings/web-crawler": "Web Crawler",
"settings/sockets": "Sockets", "settings/sockets": "Zócalos",
"settings/advanced": "Advanced", "settings/advanced": "Avanzado",
"settings.page-title": "%1 Settings", "settings.page-title": "%1 Opciones",
"section-appearance": "Appearance", "section-appearance": "Apariencia",
"appearance/themes": "Themes", "appearance/themes": "Temas",
"appearance/skins": "Skins", "appearance/skins": "Skins",
"appearance/customise": "Custom HTML & CSS", "appearance/customise": "HTML & CSS personalizado",
"section-extend": "Extend", "section-extend": "Extender",
"extend/plugins": "Plugins", "extend/plugins": "Plugins",
"extend/widgets": "Widgets", "extend/widgets": "Widgets",
"extend/rewards": "Rewards", "extend/rewards": "Recompensas",
"section-social-auth": "Social Authentication", "section-social-auth": "Autentificación Social",
"section-plugins": "Plugins", "section-plugins": "Plugins",
"extend/plugins.install": "Install Plugins", "extend/plugins.install": "Instalar plugins",
"section-advanced": "Advanced", "section-advanced": "Avanzado",
"advanced/database": "Database", "advanced/database": "Base de datos",
"advanced/events": "Events", "advanced/events": "Eventos",
"advanced/logs": "Logs", "advanced/logs": "Registros",
"advanced/errors": "Errors", "advanced/errors": "Errores",
"advanced/cache": "Cache", "advanced/cache": "Cache",
"development/logger": "Logger", "development/logger": "Registro",
"development/info": "Info", "development/info": "Información",
"reload-forum": "Reload Forum", "reload-forum": "Recargar foro",
"restart-forum": "Restart Forum", "restart-forum": "Reiniciar foro",
"logout": "Log out", "logout": "Cerrar sesión",
"view-forum": "View Forum", "view-forum": "Ver foro",
"search.placeholder": "Search...", "search.placeholder": "Buscar...",
"search.no-results": "No results...", "search.no-results": "Sin resultados...",
"search.search-forum": "Search the forum for <strong></strong>", "search.search-forum": "Search the forum for <strong></strong>",
"search.keep-typing": "Type more to see results...", "search.keep-typing": "Escribe más para ver resultados...",
"search.start-typing": "Start typing to see results...", "search.start-typing": "Empieza a escribir para ver resultados...",
"connection-lost": "Connection to %1 has been lost, attempting to reconnect..." "connection-lost": "La connexión a %1 se ha perdido, intentando reconectarse..."
} }

@ -1,6 +1,6 @@
{ {
"alert.confirm-reload": "Are you sure you wish to reload NodeBB?", "alert.confirm-reload": "NodeBB'yi yeniden yüklemek istediğinize emin misiniz?",
"alert.confirm-restart": "Are you sure you wish to restart NodeBB?", "alert.confirm-restart": "NodeBB'yi yeniden başlatmak istediğinize emin misiniz?",
"acp-title": "%1 | NodeBB Yönetici Kontrol Paneli", "acp-title": "%1 | NodeBB Yönetici Kontrol Paneli",
"settings-header-contents": "İçerikler" "settings-header-contents": "İçerikler"

@ -1,11 +1,11 @@
{ {
"post-cache": "İleti Önbelleği", "post-cache": "İleti Önbelleği",
"posts-in-cache": "Posts in Cache", "posts-in-cache": "Önbellekteki Mesajlar",
"average-post-size": "Average Post Size", "average-post-size": "Ortalama Mesaj Boyutu",
"length-to-max": "Length / Max", "length-to-max": "Uzunluk / En Fazla",
"percent-full": "%1% Full", "percent-full": "%1% Tam",
"post-cache-size": "Post Cache Size", "post-cache-size": "Mesaj Önbellek Boyutu",
"items-in-cache": "Items in Cache", "items-in-cache": "Önbellekteki Öğeler",
"control-panel": "Control Panel", "control-panel": "Kontrol Paneli",
"update-settings": "Update Cache Settings" "update-settings": "Önbellek Ayarlarını Güncelle"
} }

@ -1,8 +1,8 @@
{ {
"x-b": "%1 b", "x-b": "%1 b",
"x-mb": "%1 mb", "x-mb": "%1 mb",
"uptime-seconds": "Uptime in Seconds", "uptime-seconds": "Saniyede Bir Çalışma Zamanı",
"uptime-days": "Uptime in Days", "uptime-days": "Günde Bir Çalışma Zamanı",
"mongo": "Mongo", "mongo": "Mongo",
"mongo.version": "MongoDB Version", "mongo.version": "MongoDB Version",

@ -1,5 +1,5 @@
{ {
"alert.confirm-reload": "确认重新载入NodeBB", "alert.confirm-reload": "确认重NodeBB",
"alert.confirm-restart": "确认重启NodeBB", "alert.confirm-restart": "确认重启NodeBB",
"acp-title": "%1 | NodeBB 管理员控制面板", "acp-title": "%1 | NodeBB 管理员控制面板",

Loading…
Cancel
Save