diff --git a/.gitattributes b/.gitattributes
index 3c395463..461684ef 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,7 @@
doc/ export-ignore
tst/ export-ignore
js/.istanbul.yml export-ignore
-js/test.js export-ignore
+js/test/ export-ignore
.codeclimate.yml export-ignore
.csslintrc export-ignore
.dockerignore export-ignore
@@ -15,3 +15,6 @@ js/test.js export-ignore
.styleci.yml export-ignore
.travis.yml export-ignore
Dockerfile export-ignore
+docker-compose.yml export-ignore
+docker/ export-ignore
+composer.json export-ignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff497129..3d7ca628 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
# PrivateBin version history
* **next (not yet released)**
- * ADDED: Translations for Spanish, Occitan, Norwegian and Portuguese
+ * ADDED: Translations for Spanish, Occitan, Norwegian, Portuguese, Dutch and Hungarian
* ADDED: Option in configuration to change the default "PrivateBin" title of the site
* CHANGED: Minimum required PHP version is 5.4 (#186)
* CHANGED: Shipped .htaccess files were updated for Apache 2.4 (#192)
diff --git a/CREDITS.md b/CREDITS.md
index cc63cde8..26ba5575 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -36,3 +36,5 @@ Sébastien Sauvage - original idea and main developer
* Quent-in - Occitan
* idarlund - Norwegian
* Tulio Leao - Portuguese
+* Michael van Schaik - Dutch
+* Péter Tabajdi - Hungarian
diff --git a/js/privatebin.js b/js/privatebin.js
index e6f8e743..8d81d287 100644
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -455,7 +455,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
return n % 10 === 1 && n % 100 !== 11 ? 0 : (n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2);
case 'sl':
return n % 100 === 1 ? 1 : (n % 100 === 2 ? 2 : (n % 100 === 3 || n % 100 === 4 ? 3 : 0));
- // de, en, es, hu, it, no, pt
+ // de, en, es, hu, it, nl, no, pt
default:
return n !== 1 ? 1 : 0;
}
diff --git a/lib/I18n.php b/lib/I18n.php
index 5ae9bade..0b0678db 100644
--- a/lib/I18n.php
+++ b/lib/I18n.php
@@ -305,7 +305,7 @@ class I18n
return $n % 10 == 1 && $n % 100 != 11 ? 0 : ($n % 10 >= 2 && $n % 10 <= 4 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2);
case 'sl':
return $n % 100 == 1 ? 1 : ($n % 100 == 2 ? 2 : ($n % 100 == 3 || $n % 100 == 4 ? 3 : 0));
- // de, en, es, it, no, pt
+ // de, en, es, hu, it, nl, no, pt
default:
return $n != 1 ? 1 : 0;
}
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 62e47630..8e7be9cb 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -75,7 +75,7 @@ if ($MARKDOWN):
-
+
diff --git a/tpl/page.php b/tpl/page.php
index c272411b..9e3261be 100644
--- a/tpl/page.php
+++ b/tpl/page.php
@@ -54,7 +54,7 @@ if ($QRCODE):
-
+