Merge branch 'master' into glitch-soc/merge-upstream

2018-08-11 15:45:42 +02:00
parent 741fb32bef 44680c46ed
commit 84a2587d44
83 changed files with 1184 additions and 293 deletions
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@ -34,7 +34,7 @@ module SettingsHelper
    pt: 'Português',
    'pt-BR': 'Português do Brasil',
    ru: 'Русский',
-    sk: 'Slovensky',
+    sk: 'Slovenčina',
    sl: 'Slovenščina',
    sr: 'Српски',
    'sr-Latn': 'Srpski (latinica)',