Merge remote-tracking branch 'origin/master'

diff --git a/lib/lang.php b/lib/lang.php
index 263afb07f172827341fb0cbc985dfc321dc13629..fba5dbed809895926efa5ea90b29bdd8caa88e1a 100644 (file)
--- a/lib/lang.php
+++ b/lib/lang.php
@@ -19,6 +19,7 @@
 \r
  global $languages_list;\r
  $languages_list = array ('auto' => 'Automatic',\r
+                          'de' => 'Deutsch',\r
                           'en' => 'English',\r
                           'fr' => 'Français');\r
 \r

diff --git a/lib/template/footer.php b/lib/template/footer.php
index 50f7b83f5d35271dc20c9c4451a2131766252fdd..d9474219931af96f278a83f52e1c2533c1bae10f 100644 (file)
--- a/lib/template/footer.php
+++ b/lib/template/footer.php
@@ -1,6 +1,11 @@
 
 <div id="copyright">
-<p><a href="https://gitlab.com/mojo42/Jirafeau/wikis/home"></a><br /><a href="http://www.gnu.org/licenses/agpl.html">agplv3</a> | <a href="https://gitlab.com/mojo42/Jirafeau/wikis/home">Jirafeau Project</a> | <a href="<?php echo $cfg['web_root'] . '/tos.php'; ?>">Terms of Service</a></p>
+    <p>
+        <br />
+        <a href="https://www.gnu.org/licenses/agpl.html">agplv3</a> |
+        <a href="https://gitlab.com/mojo42/Jirafeau/wikis/home"><?php echo t('Jirafeau Project') ?></a> |
+        <a href="<?php echo rtrim($cfg['web_root'], '/') . '/tos.php'; ?>"><?php echo t('Term Of Service') ?></a>
+    </p>
 </div>
 </div>
 <div id="jyraphe">