mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-01-06 15:42:52 +01:00
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts: # src/upgrade.js
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
"name": "nodebb",
|
||||
"license": "GPL-3.0",
|
||||
"description": "NodeBB Forum",
|
||||
"version": "1.4.5",
|
||||
"version": "1.4.6",
|
||||
"homepage": "http://www.nodebb.org",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
@@ -77,7 +77,7 @@
|
||||
"promise-polyfill": "^6.0.2",
|
||||
"prompt": "^1.0.0",
|
||||
"redis": "~2.6.2",
|
||||
"request": "^2.44.0",
|
||||
"request": "2.81.0",
|
||||
"rimraf": "~2.5.0",
|
||||
"rss": "^1.0.0",
|
||||
"sanitize-html": "^1.13.0",
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
"running-version": "Es läuft <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
|
||||
"keep-updated": "Stelle sicher, dass dein NodeBB immer auf dem neuesten Stand für die neuesten Sicherheits-Patches und Bug-fixes ist.",
|
||||
"up-to-date": "<p>System ist <strong>aktuell</strong> <i class=\"fa fa-check\"></i></p>",
|
||||
"upgrade-available": "<p>Version (v%1) wurde veröffentlicht. Beachte <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">um ein NodeBB Upgrade durchzuführen</a>.</p>",
|
||||
"prerelease-upgrade-available": "<p>Das ist eine veraltete pre-release Version von NodeBB. Version (v%1) wurde veröffentlicht. Beachte <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">um ein NodeBB Upgrade durchzuführen</a>.</p>",
|
||||
"upgrade-available": "<p>Version (v%1) wurde veröffentlicht. Ziehen Sie ein<a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">NodeBB Upgrade in Betracht</a>.</p>",
|
||||
"prerelease-upgrade-available": "<p>Das ist eine veraltete pre-release Version von NodeBB. Version (v%1) wurde veröffentlicht. Ziehen Sie ein<a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">NodeBB Upgrade in Betracht</a>.</p>",
|
||||
"prerelease-warning": "<p>Das ist eine <strong>pre-release</strong> Version von NodeBB. Es können ungewollte Fehler auftreten. <i class=\"fa fa-exclamation-triangle\"></i></p>",
|
||||
"running-in-development": "<span>Das Forum wurde im Entwicklermodus gestartet. Das Forum könnte potenziellen Gefahren ausgeliefert sein. Bitte kontaktieren Sie Ihren Systemadministrator.</span>",
|
||||
|
||||
"notices": "Hinweise",
|
||||
"restart-not-required": "Neustart nicht benötigt",
|
||||
"restart-not-required": "Kein Neustart benötigt",
|
||||
"restart-required": "Neustart benötigt",
|
||||
"search-plugin-installed": "Such-Plugin installiert",
|
||||
"search-plugin-not-installed": "Such-Plugin nicht installiert",
|
||||
"search-plugin-not-installed": "Kein Such-Plugin installiert",
|
||||
"search-plugin-tooltip": "Installieren Sie ein Such-Plugin auf der Plugin seite um die Such-Funktionalität zu aktivieren",
|
||||
|
||||
"control-panel": "Systemsteuerung",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"alert.confirm-reload": "Are you sure you wish to reload NodeBB?",
|
||||
"alert.confirm-restart": "Are you sure you wish to restart NodeBB?",
|
||||
"alert.confirm-reload": "Είσαι σίγουρος/η πως θέλεις να επαναφορτώσεις το NodeBB?",
|
||||
"alert.confirm-restart": "Είσαι σίγουρος/η πως θέλεις να επανεκκινήσεις το NodeBB?",
|
||||
|
||||
"acp-title": "%1 | NodeBB Admin Control Panel",
|
||||
"settings-header-contents": "Contents"
|
||||
"acp-title": "%1 | NodeBB Πίνακας ελέγχου",
|
||||
"settings-header-contents": "Περιεχόμενα"
|
||||
}
|
||||
@@ -1,17 +1,17 @@
|
||||
{
|
||||
"category": "Category",
|
||||
"subcategories": "Subcategories",
|
||||
"category": "Κατηγορία",
|
||||
"subcategories": "Υποκατηγορίες",
|
||||
"new_topic_button": "Νέο Θέμα",
|
||||
"guest-login-post": "Log in to post",
|
||||
"guest-login-post": "Συνδέσου για να δημοσιεύσεις",
|
||||
"no_topics": "<strong>Δεν υπάρχουν θέματα σε αυτή την κατηγορία.</strong><br />Γιατί δεν δοκιμάζεις να δημοσιεύσεις ένα εσύ;",
|
||||
"browsing": "περιηγούνται",
|
||||
"no_replies": "Κανείς δεν έχει απαντήσει",
|
||||
"no_new_posts": "No new posts.",
|
||||
"no_new_posts": "Δεν υπάρχουν νέες δημοσιεύσεις",
|
||||
"share_this_category": "Μοιράσου αυτή την κατηγορία",
|
||||
"watch": "Watch",
|
||||
"ignore": "Αγνόηση",
|
||||
"watching": "Watching",
|
||||
"ignoring": "Ignoring",
|
||||
"ignoring": "Αγνόησε",
|
||||
"watching.description": "Show topics in unread",
|
||||
"ignoring.description": "Do not show topics in unread",
|
||||
"watch.message": "You are now watching updates from this category and all subcategories",
|
||||
|
||||
@@ -9,9 +9,9 @@
|
||||
"repeat_password": "Επιβεβαίωση Κωδικού",
|
||||
"enter_email": "Παρακαλώ γράψε την <strong>διεύθυνση email σου</strong> και θα σου στείλουμε ένα email με οδηγίες για το πως να επαναφέρεις τον λογαριασμό σου.",
|
||||
"enter_email_address": "Εισαγωγή Διεύθυνσης Email",
|
||||
"password_reset_sent": "Password Reset Sent",
|
||||
"invalid_email": "Invalid Email / Email does not exist!",
|
||||
"password_too_short": "The password entered is too short, please pick a different password.",
|
||||
"passwords_do_not_match": "The two passwords you've entered do not match.",
|
||||
"password_expired": "Your password has expired, please choose a new password"
|
||||
"password_reset_sent": "Η επαναφορά κωδικού στάλθηκε",
|
||||
"invalid_email": "Λάθος Email ή το Email δεν υπάρχει!",
|
||||
"password_too_short": "Ο κωδικός είναι πολύ μικρός, παρακαλώ επέλεξε διαφορετικό.",
|
||||
"passwords_do_not_match": "Οι κωδικοί δεν ταιριάζουν μεταξύ τους.",
|
||||
"password_expired": "Ο κωδικός έληξε, παρακαλώ επίλεξε νέο κωδικό"
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"you-are-on": "Info - Você está em <strong>%1:%2</strong>",
|
||||
"you-are-on": "Informação - Você está em <strong>%1:%2</strong>",
|
||||
"host": "host",
|
||||
"pid": "pid",
|
||||
"nodejs": "nodejs",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"none": "O seu fórum ainda não tem quaisquer tópicos com tags.",
|
||||
"none": "O seu fórum ainda não tem tópicos com tags.",
|
||||
"bg-color": "Cor de Fundo",
|
||||
"text-color": "Cor do Text",
|
||||
"create-modify": "Criar & Modificar Tags",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"handles": "Handles para Visitantes",
|
||||
"handles": "Apelidos para Visitantes",
|
||||
"handles.enabled": "Permitir handles de visitantes",
|
||||
"handles.enabled-help": "Esta opção mostra um novo campo que permite visitantes de escolher um nome para associar à cada post que eles fizerem. Se desabilitado, eles serão simplesmente chamados de \"Visitante\".",
|
||||
"privileges": "Privilégios de Visitantes",
|
||||
|
||||
@@ -4,6 +4,6 @@
|
||||
"disable-down-voting": "Desabilitar Baixo Votar",
|
||||
"votes-are-public": "All Votes Are Public",
|
||||
"thresholds": "Limiares de Atividade",
|
||||
"min-rep-downvote": "Reputação mínima para baixovotar posts",
|
||||
"min-rep-downvote": "Reputação mínima para votar negativamente em posts",
|
||||
"min-rep-flag": "Reputação mínima para sinalizar posts"
|
||||
}
|
||||
@@ -15,6 +15,6 @@
|
||||
"watching.description": "Mostrar tópicos em não-lido",
|
||||
"ignoring.description": "Não mostrar tópicos em não-lido",
|
||||
"watch.message": "Agora você está seguindo as atualizações desta categoria e de todas as subcategorias",
|
||||
"ignore.message": "Agora você está ignorando as atualizações desta categoria e de todas as subcategorias",
|
||||
"ignore.message": "Agora você está ignorando as atualizações desta categoria e de todas as suas subcategorias",
|
||||
"watched-categories": "Categorias acompanhadas"
|
||||
}
|
||||
@@ -53,10 +53,10 @@
|
||||
"topics": "Tópicos",
|
||||
"posts": "Posts",
|
||||
"best": "Melhor",
|
||||
"upvoters": "Cimavotadores",
|
||||
"upvoted": "Votado positivamente",
|
||||
"downvoters": "Baixovotadores",
|
||||
"downvoted": "Votado negativamente",
|
||||
"upvoters": "Votos positivos",
|
||||
"upvoted": "Votou positivamente",
|
||||
"downvoters": "Votos negativos",
|
||||
"downvoted": "Votou negativamente",
|
||||
"views": "Visualizações",
|
||||
"reputation": "Reputação",
|
||||
"read_more": "ler mais",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"installed": "已安装",
|
||||
"active": "激活",
|
||||
"active": "已启用",
|
||||
"inactive": "未生效",
|
||||
"out-of-date": "已过期",
|
||||
"none-found": "无插件。",
|
||||
|
||||
@@ -415,7 +415,7 @@
|
||||
* @returns {string}
|
||||
*/
|
||||
Translator.escape = function escape(text) {
|
||||
return typeof text === 'string' ? text.replace(/\[/g, '[').replace(/\]/g, ']') : text;
|
||||
return typeof text === 'string' ? text.replace(/\[\[/g, '[[').replace(/\]\]/g, ']]') : text;
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user