From bfcce3b4bf463bf5c26bde6d67965428679b157c Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Tue, 14 Mar 2017 21:27:44 -0400 Subject: [PATCH 1/6] Update README.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 039f18fb..1f0175db 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ - [Documentation](#documentation) - [Requirements](#requirements) - [Change Log](https://github.com/Requarks/wiki/blob/master/CHANGELOG.md) -- [Project Status](https://waffle.io/Requarks/wiki) +- [Project Planning](https://waffle.io/Requarks/wiki) - [Special Thanks](#special-thanks) ### Documentation @@ -41,6 +41,10 @@ Wiki.js can run on virtually all platforms where Node.js can (Windows, Mac, Linu Read the full [prerequisites](https://docs.wiki.requarks.io/prerequisites) article for full details. +### Gitter + +Want to discuss features, ideas or issues? Join our [gitter channel](https://gitter.im/Requarks/wiki). We are very active and friendly! + ### Special Thanks ![Browserstack](https://wiki.requarks.io/assets/images/logo_browserstack.png) From 25c0562ecfc4dec6d396bdf0021a6adbc9525e1f Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Thu, 16 Mar 2017 23:57:56 +0000 Subject: [PATCH 2/6] LingoHub Update :rocket: Manual push by LingoHub User: Nicolas Giard. Project: wiki Made with :heart: by https://lingohub.com --- locales/en/auth.json | 14 +++++++------- locales/en/common.json | 18 +++++++++--------- locales/es/auth.json | 11 +++++++++++ locales/es/common.json | 11 +++++++++++ locales/fr/auth.json | 14 +++++++------- locales/fr/common.json | 18 +++++++++--------- 6 files changed, 54 insertions(+), 32 deletions(-) create mode 100644 locales/es/auth.json create mode 100644 locales/es/common.json diff --git a/locales/en/auth.json b/locales/en/auth.json index 93612c4c..50ce7873 100644 --- a/locales/en/auth.json +++ b/locales/en/auth.json @@ -1,11 +1,11 @@ { - "providers": { - "local": "Local", - "windowslive": "Microsoft Account", - "google": "Google ID", - "facebook": "Facebook", + "providers": { + "local": "Local", + "windowslive": "Microsoft Account", + "google": "Google ID", + "facebook": "Facebook", "github": "GitHub", "slack": "Slack", "ldap": "LDAP / Active Directory" - } -} + } +} \ No newline at end of file diff --git a/locales/en/common.json b/locales/en/common.json index 3d712c83..d088a86f 100644 --- a/locales/en/common.json +++ b/locales/en/common.json @@ -1,11 +1,11 @@ { - "wiki": "Wiki", - "headers": { - "overview": "Overview" - }, - "footer": { - "poweredby": "Powered by", - "home": "Home", - "top": "Return to top" - } + "wiki": "Wiki", + "headers": { + "overview": "Overview" + }, + "footer": { + "poweredby": "Powered by", + "home": "Home", + "top": "Return to top" + } } \ No newline at end of file diff --git a/locales/es/auth.json b/locales/es/auth.json new file mode 100644 index 00000000..05edd858 --- /dev/null +++ b/locales/es/auth.json @@ -0,0 +1,11 @@ +{ + "providers": { + "local": "Local", + "windowslive": "Cuenta de Microsoft", + "google": "ID de google", + "facebook": "Facebook", + "github": "GitHub", + "slack": "Flojo", + "ldap": "LDAP / Active Directory" + } +} \ No newline at end of file diff --git a/locales/es/common.json b/locales/es/common.json new file mode 100644 index 00000000..66308f1d --- /dev/null +++ b/locales/es/common.json @@ -0,0 +1,11 @@ +{ + "wiki": "Wiki", + "headers": { + "overview": "Información General" + }, + "footer": { + "poweredby": "Energizado por", + "home": "Casa", + "top": "Volver a la cima" + } +} \ No newline at end of file diff --git a/locales/fr/auth.json b/locales/fr/auth.json index 38e8e0c9..5d62644c 100644 --- a/locales/fr/auth.json +++ b/locales/fr/auth.json @@ -1,11 +1,11 @@ { - "providers": { - "local": "Local", - "windowslive": "Compte Microsoft", - "google": "Google ID", - "facebook": "Facebook", + "providers": { + "local": "Local", + "windowslive": "Compte Microsoft", + "google": "Google ID", + "facebook": "Facebook", "github": "GitHub", "slack": "Slack", "ldap": "LDAP / Active Directory" - } -} + } +} \ No newline at end of file diff --git a/locales/fr/common.json b/locales/fr/common.json index 9dea5cae..54c10417 100644 --- a/locales/fr/common.json +++ b/locales/fr/common.json @@ -1,11 +1,11 @@ { - "wiki": "Wiki", - "headers": { - "overview": "Vue d'ensemble" - }, - "footer": { - "poweredby": "Propulsé par", - "home": "Accueil", - "top": "Retour en haut" - } + "wiki": "Wiki", + "headers": { + "overview": "Vue d'ensemble" + }, + "footer": { + "poweredby": "Propulsé par", + "home": "Accueil", + "top": "Retour en haut" + } } \ No newline at end of file From a680dcde3dbe2120b1a4158191e06a99281c1a15 Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Fri, 17 Mar 2017 00:07:01 +0000 Subject: [PATCH 3/6] LingoHub Update :rocket: Manual push by LingoHub User: Nicolas Giard. Project: Wiki.js Made with :heart: by https://lingohub.com --- locales/de/auth.json | 11 +++++++++++ locales/de/common.json | 11 +++++++++++ locales/pt/auth.json | 11 +++++++++++ locales/pt/common.json | 11 +++++++++++ locales/ru/auth.json | 11 +++++++++++ locales/ru/common.json | 11 +++++++++++ 6 files changed, 66 insertions(+) create mode 100644 locales/de/auth.json create mode 100644 locales/de/common.json create mode 100644 locales/pt/auth.json create mode 100644 locales/pt/common.json create mode 100644 locales/ru/auth.json create mode 100644 locales/ru/common.json diff --git a/locales/de/auth.json b/locales/de/auth.json new file mode 100644 index 00000000..8740e41b --- /dev/null +++ b/locales/de/auth.json @@ -0,0 +1,11 @@ +{ + "providers": { + "local": "Lokal", + "windowslive": "Microsoft-Konto", + "google": "Google-ID", + "facebook": "Facebook", + "github": "GitHub", + "slack": "Locker", + "ldap": "LDAP / Active Directory" + } +} \ No newline at end of file diff --git a/locales/de/common.json b/locales/de/common.json new file mode 100644 index 00000000..4902fae9 --- /dev/null +++ b/locales/de/common.json @@ -0,0 +1,11 @@ +{ + "wiki": "Wiki", + "headers": { + "overview": "Überblick" + }, + "footer": { + "poweredby": "Unterstützt von", + "home": "Zuhause", + "top": "Zurück nach oben" + } +} \ No newline at end of file diff --git a/locales/pt/auth.json b/locales/pt/auth.json new file mode 100644 index 00000000..83bc5bdc --- /dev/null +++ b/locales/pt/auth.json @@ -0,0 +1,11 @@ +{ + "providers": { + "local": "Local", + "windowslive": "Conta Microsoft", + "google": "Google ID", + "facebook": "Facebook", + "github": "GitHub", + "slack": "negligente", + "ldap": "LDAP / Active Directory" + } +} \ No newline at end of file diff --git a/locales/pt/common.json b/locales/pt/common.json new file mode 100644 index 00000000..cee2ddf8 --- /dev/null +++ b/locales/pt/common.json @@ -0,0 +1,11 @@ +{ + "wiki": "Wiki", + "headers": { + "overview": "Visão geral" + }, + "footer": { + "poweredby": "Distribuído por", + "home": "Casa", + "top": "Retornar ao topo" + } +} \ No newline at end of file diff --git a/locales/ru/auth.json b/locales/ru/auth.json new file mode 100644 index 00000000..64d85981 --- /dev/null +++ b/locales/ru/auth.json @@ -0,0 +1,11 @@ +{ + "providers": { + "local": "Местный", + "windowslive": "Счет Microsoft", + "google": "Google ID", + "facebook": "Facebook", + "github": "GitHub", + "slack": "слабина", + "ldap": "LDAP / Active Directory" + } +} \ No newline at end of file diff --git a/locales/ru/common.json b/locales/ru/common.json new file mode 100644 index 00000000..85a70097 --- /dev/null +++ b/locales/ru/common.json @@ -0,0 +1,11 @@ +{ + "wiki": "Wiki", + "headers": { + "overview": "Обзор" + }, + "footer": { + "poweredby": "Питаться от", + "home": "Главная", + "top": "Вернуться к началу" + } +} \ No newline at end of file From afb35ed2514a0c1fc00c20ad484a2b6659f7f72c Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Fri, 17 Mar 2017 20:12:39 -0400 Subject: [PATCH 4/6] LingoHub Update :rocket: Manual push by LingoHub User: Nicolas Giard. Project: Wiki.js Made with :heart: by https://lingohub.com --- locales/ko/auth.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 locales/ko/auth.json diff --git a/locales/ko/auth.json b/locales/ko/auth.json new file mode 100644 index 00000000..6f31cf5a --- /dev/null +++ b/locales/ko/auth.json @@ -0,0 +1 @@ +{ } \ No newline at end of file From eb860b2b376c00c07a4ade09e56a2827c7a49ec3 Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Fri, 17 Mar 2017 20:14:25 -0400 Subject: [PATCH 5/6] LingoHub Update :rocket: Manual push by LingoHub User: Nicolas Giard. Project: Wiki.js Made with :heart: by https://lingohub.com --- locales/ko/auth.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/locales/ko/auth.json b/locales/ko/auth.json index 6f31cf5a..263a2b9a 100644 --- a/locales/ko/auth.json +++ b/locales/ko/auth.json @@ -1 +1,11 @@ -{ } \ No newline at end of file +{ + "providers": { + "local": "노동 조합 지부", + "windowslive": "Microsoft 계정", + "google": "구글 ID", + "facebook": "페이스 북", + "github": "GitHub", + "slack": "Slack", + "ldap": "LDAP / Active Directory" + } +} \ No newline at end of file From 56bd3c0dd0bc7b1dad96f5dd981c2b31136daae6 Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Fri, 17 Mar 2017 20:14:52 -0400 Subject: [PATCH 6/6] LingoHub Update :rocket: Manual push by LingoHub User: Nicolas Giard. Project: Wiki.js Made with :heart: by https://lingohub.com --- locales/ko/common.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 locales/ko/common.json diff --git a/locales/ko/common.json b/locales/ko/common.json new file mode 100644 index 00000000..f27d2aec --- /dev/null +++ b/locales/ko/common.json @@ -0,0 +1,11 @@ +{ + "wiki": "위키", + "headers": { + "overview": "개요" + }, + "footer": { + "poweredby": "에 의해 구동", + "home": "집", + "top": "맨 위로" + } +} \ No newline at end of file