Merge branch 'master' of https://github.com/Requarks/wiki

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)  

locales/de/auth.json

+{
+  "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

locales/de/common.json

+{
+  "wiki": "Wiki",
+  "headers": {
+    "overview": "Überblick"
+  },
+  "footer": {
+    "poweredby": "Unterstützt von",
+    "home": "Zuhause",
+    "top": "Zurück nach oben"
+  }
+}
\ No newline at end of file

locales/en/auth.json

 {
-	"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

locales/en/common.json

 {
-	"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

locales/es/auth.json

+{
+  "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

locales/es/common.json

+{
+  "wiki": "Wiki",
+  "headers": {
+    "overview": "Información General"
+  },
+  "footer": {
+    "poweredby": "Energizado por",
+    "home": "Casa",
+    "top": "Volver a la cima"
+  }
+}
\ No newline at end of file

locales/fr/auth.json

 {
-	"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

locales/fr/common.json

 {
-	"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

locales/ko/auth.json

+{
+  "providers": {
+    "local": "노동 조합 지부",
+    "windowslive": "Microsoft 계정",
+    "google": "구글 ID",
+    "facebook": "페이스 북",
+    "github": "GitHub",
+    "slack": "Slack",
+    "ldap": "LDAP / Active Directory"
+  }
+}
\ No newline at end of file

locales/ko/common.json

+{
+  "wiki": "위키",
+  "headers": {
+    "overview": "개요"
+  },
+  "footer": {
+    "poweredby": "에 의해 구동",
+    "home": "집",
+    "top": "맨 위로"
+  }
+}
\ No newline at end of file

locales/pt/auth.json

+{
+  "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

locales/pt/common.json

+{
+  "wiki": "Wiki",
+  "headers": {
+    "overview": "Visão geral"
+  },
+  "footer": {
+    "poweredby": "Distribuído por",
+    "home": "Casa",
+    "top": "Retornar ao topo"
+  }
+}
\ No newline at end of file

locales/ru/auth.json

+{
+  "providers": {
+    "local": "Местный",
+    "windowslive": "Счет Microsoft",
+    "google": "Google ID",
+    "facebook": "Facebook",
+    "github": "GitHub",
+    "slack": "слабина",
+    "ldap": "LDAP / Active Directory"
+  }
+}
\ No newline at end of file

locales/ru/common.json

+{
+  "wiki": "Wiki",
+  "headers": {
+    "overview": "Обзор"
+  },
+  "footer": {
+    "poweredby": "Питаться от",
+    "home": "Главная",
+    "top": "Вернуться к началу"
+  }
+}
\ No newline at end of file