8 files changed, 86 insertions, 93 deletions

diff --git a/common/header.inc.j2 b/common/header.inc.j2
index 738feff1..2923e700 100644
--- a/common/header.inc.j2
+++ b/common/header.inc.j2
@@ -33,12 +33,10 @@
     <link href="/dist/css/bootstrap.min.css" rel="stylesheet">
     <!-- Custom styles for this template -->
     <link href="justified-nav.css" rel="stylesheet">
-    <link href="lang.css" rel="stylesheet">
     <link href="styles.css" rel="stylesheet">
 
     <script src="/dist/js/jquery-1.11.1.min.js"></script>
     <script src="/dist/js/bootstrap.min.js"></script>
-    <script src="lang.js"></script>
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
diff --git a/common/navigation.inc.j2 b/common/navigation.inc.j2
index 4e19e852..4f621b3d 100644
--- a/common/navigation.inc.j2
+++ b/common/navigation.inc.j2
@@ -9,23 +9,23 @@
         </div>
         <div class="collapse navbar-collapse" id="main-navbar">
           <ul class="nav nav-justified">
-            <li class="m_index">{{ _("<a href='/'>Home</a>") }}</li>
-            <li class="m_demo btn btn-outline-success">{{ _("<a href='https://demo.taler.net/' target='_blank'>Demo</a>") }}</li>
-            <li class="m_citizens">{{ _("<a href='/citizens'>Citizens</a>") }}</li>
-            <li class="m_merchants">{{ _("<a href='/merchants'>Merchants</a>") }}</li>
-            <li class="m_governments">{{ _("<a href='/governments'>Governments</a>") }}</li>
-            <li class="m_investors">{{ _("<a href='/investors'>Operators</a>") }}</li>
-            <li class="m_developers">{{ _("<a href='/developers'>Developers</a>") }}</li>
-            <li class="m_about">{{ _("<a href='/about'>About&nbsp;us</a>") }}</li>
+            <li class="m_index"><a href=".">{{ _("Home") }}</a></li>
+            <li class="m_demo btn btn-outline-success"><a href="https://demo.taler.net/" target="_blank">{{ _("Demo") }}</a></li>
+            <li class="m_citizens"><a href='citizens'>{{ _("Citizens") }}</a></li>
+            <li class="m_merchants"><a href='merchants'>{{ _("Merchants") }}</a></li>
+            <li class="m_governments"><a href='governments'>{{ _("Governments") }}</a></li>
+            <li class="m_investors"><a href='investors'>{{ _("Operators") }}</a></li>
+            <li class="m_developers"><a href='developers'>{{ _("Developers") }}</a></li>
+            <li class="m_about"><a href='about'>{{ _("About&nbsp;us") }}</a></li>
           </ul>
         </div>
       </div>
        <div class="navbar navbar-default navbar-fixed-bottom" role="navigation">
          <div class="container lang-slector">
-           <a href="#" onclick="setLang('en');"><img src="images/gb.png" height="15" width="23" alt="English"></a>
-           <a href="#" onclick="setLang('de');"><img src="images/de.png" height="15" width="25" alt="Deutsch"></a>
-           <a href="#" onclick="setLang('fr');"><img src="images/fr.png" height="15" width="22" alt="Français"></a>
-           <a href="#" onclick="setLang('it');"><img src="images/it.png" height="15" width="22" alt="Italiano"></a>
-           <a href="#" onclick="setLang('es');"><img src="images/es.png" height="15" width="23" alt="Español"></a>
+           <a href="/en/"><img src="images/gb.png" height="15" width="23" alt="English"></a>
+           <a href="/de/"><img src="images/de.png" height="15" width="25" alt="Deutsch"></a>
+           <a href="/fr/"><img src="images/fr.png" height="15" width="22" alt="Français"></a>
+           <a href="/it/"><img src="images/it.png" height="15" width="22" alt="Italiano"></a>
+           <a href="/es/"><img src="images/es.png" height="15" width="23" alt="Español"></a>
          </div>
        </div>
diff --git a/index.html.j2 b/index.html.j2
index ba4e9090..fced0bfa 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -58,7 +58,7 @@
         <div class="col-lg-4">
           <h2>News</h2>
           <p>{{ _("Taler Web payments paper published.") }}</p>
-          <p><a class="btn btn-primary" href="/news" role="button">{{ _("More news »") }}</a></p>
+          <p><a class="btn btn-primary" href="news" role="button">{{ _("More news »") }}</a></p>
         </div>
       </div>
        <div class="col-lg-12">
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 8f853dbd..74bd23de 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -1570,34 +1570,33 @@ msgstr ""
 "href='https://www.gnu.org/'>Freier Software</a> erstellt."
 
 #: common/navigation.inc.j2:12
-msgid "<a href='/'>Home</a>"
-msgstr "<a href='/'>Home</a>"
+msgid "Home"
+msgstr "Home"
 
 #: common/navigation.inc.j2:13
-msgid "<a href='https://demo.taler.net/' target='_blank'>Demo</a>"
-msgstr "<a href='https://demo.taler.net/' target='_blank'>Demo</a>"
+msgid "Demo"
+msgstr "Demo"
 
 #: common/navigation.inc.j2:14
-msgid "<a href='/citizens'>Citizens</a>"
-msgstr "<a href='/citizens'>Bürger</a>"
+msgid "Citizens"
+msgstr "Bürger"
 
 #: common/navigation.inc.j2:15
-msgid "<a href='/merchants'>Merchants</a>"
-msgstr "<a href='/merchants'>Händler</a>"
+msgid "Merchants"
+msgstr "Händler"
 
 #: common/navigation.inc.j2:16
-msgid "<a href='/governments'>Governments</a>"
-msgstr "<a href='/governments'>Regierungen</a>"
+msgid "Governments"
+msgstr "Regierungen"
 
 #: common/navigation.inc.j2:17
-msgid "<a href='/investors'>Operators</a>"
-msgstr "<a href='/investors'>Betreiber</a>"
+msgid "Operators"
+msgstr "Betreiber"
 
 #: common/navigation.inc.j2:18
-msgid "<a href='/developers'>Developers</a>"
-msgstr "<a href='/developers'>Entwickler</a>"
+msgid "Developers"
+msgstr "Entwickler"
 
 #: common/navigation.inc.j2:19
-msgid "<a href='/about'>About&nbsp;us</a>"
-msgstr "<a href='/about'>Über uns</a>"
-
+msgid "About&nbsp;us"
+msgstr "Über uns"
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 92d226b4..0bca5deb 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -1044,34 +1044,33 @@ msgid ""
 msgstr ""
 
 #: common/navigation.inc.j2:12
-msgid "<a href='/'>Home</a>"
+msgid "Home"
 msgstr ""
 
 #: common/navigation.inc.j2:13
-msgid "<a href='https://demo.taler.net/' target='_blank'>Demo</a>"
+msgid "Demo"
 msgstr ""
 
 #: common/navigation.inc.j2:14
-msgid "<a href='/citizens'>Citizens</a>"
+msgid "Citizens"
 msgstr ""
 
 #: common/navigation.inc.j2:15
-msgid "<a href='/merchants'>Merchants</a>"
+msgid "Merchants"
 msgstr ""
 
 #: common/navigation.inc.j2:16
-msgid "<a href='/governments'>Governments</a>"
+msgid "Governments"
 msgstr ""
 
 #: common/navigation.inc.j2:17
-msgid "<a href='/investors'>Operators</a>"
+msgid "Operators"
 msgstr ""
 
 #: common/navigation.inc.j2:18
-msgid "<a href='/developers'>Developers</a>"
+msgid "Developers"
 msgstr ""
 
 #: common/navigation.inc.j2:19
-msgid "<a href='/about'>About&nbsp;us</a>"
+msgid "About&nbsp;us"
 msgstr ""
-
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index db21b3cc..02d468b8 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -1580,34 +1580,33 @@ msgstr ""
 "Libre</a> only."
 
 #: common/navigation.inc.j2:12
-msgid "<a href='/'>Home</a>"
-msgstr "<a href='/'>Inicio</a>"
+msgid "Home"
+msgstr "Inicio"
 
 #: common/navigation.inc.j2:13
-msgid "<a href='https://demo.taler.net/' target='_blank'>Demo</a>"
-msgstr "<a href='https://demo.taler.net/' target='_blank'>Demo</a>"
+msgid "Demo"
+msgstr "Demo"
 
 #: common/navigation.inc.j2:14
-msgid "<a href='/citizens'>Citizens</a>"
-msgstr "<a href='/citizens'>Ciudadanos</a>"
+msgid "Citizens"
+msgstr "Ciudadanos"
 
 #: common/navigation.inc.j2:15
-msgid "<a href='/merchants'>Merchants</a>"
-msgstr "<a href='/merchants'>Comerciantes</a>"
+msgid "Merchants"
+msgstr "Comerciantes"
 
 #: common/navigation.inc.j2:16
-msgid "<a href='/governments'>Governments</a>"
-msgstr "<a href='/governments'>Gobiernos</a>"
+msgid "Governments"
+msgstr "Gobiernos"
 
 #: common/navigation.inc.j2:17
-msgid "<a href='/investors'>Operators</a>"
-msgstr "<a href='/investors'>Inversores</a>"
+msgid "Operators"
+msgstr "Inversores"
 
 #: common/navigation.inc.j2:18
-msgid "<a href='/developers'>Developers</a>"
-msgstr "<a href='/developers'>Programadores</a>"
+msgid "Developers"
+msgstr "Programadores"
 
 #: common/navigation.inc.j2:19
-msgid "<a href='/about'>About&nbsp;us</a>"
-msgstr "<a href='/about'>Quiénes somos</a>"
-
+msgid "About&nbsp;us"
+msgstr "Quiénes somos"
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index c271e808..b6952ed7 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -1565,35 +1565,34 @@ msgid ""
 msgstr ""
 
 #: common/navigation.inc.j2:12
-msgid "<a href='/'>Home</a>"
-msgstr "<a href='/'>Accueil</a>"
+msgid "Home"
+msgstr "Accueil"
 
 #: common/navigation.inc.j2:13
-msgid "<a href='https://demo.taler.net/' target='_blank'>Demo</a>"
-msgstr "<a href='https://demo.taler.net/' target='_blank'>Démo</a>"
+msgid "Demo"
+msgstr "Démo"
 
 #: common/navigation.inc.j2:14
-msgid "<a href='/citizens'>Citizens</a>"
-msgstr "<a href='/citizens'>Citoyens</a>"
+msgid "Citizens"
+msgstr "Citoyens"
 
 #: common/navigation.inc.j2:15
-msgid "<a href='/merchants'>Merchants</a>"
-msgstr "<a href='/merchants'>Commerçants</a>"
+msgid "Merchants"
+msgstr "Commerçants"
 
 #: common/navigation.inc.j2:16
-msgid "<a href='/governments'>Governments</a>"
-msgstr "<a href='/governments'>Gouvernements</a>"
+msgid "Governments"
+msgstr "Gouvernements"
 
 #: common/navigation.inc.j2:17
 #, fuzzy
-msgid "<a href='/investors'>Operators</a>"
-msgstr "<a href='/investors'>Investisseurs</a>"
+msgid "Operators"
+msgstr "Investisseurs"
 
 #: common/navigation.inc.j2:18
-msgid "<a href='/developers'>Developers</a>"
-msgstr "<a href='/developers'>Développeurs</a>"
+msgid "Developers"
+msgstr "Développeurs"
 
 #: common/navigation.inc.j2:19
-msgid "<a href='/about'>About&nbsp;us</a>"
-msgstr "<a href='/about'>À&nbsp;propos</a>"
-
+msgid "About&nbsp;us"
+msgstr "À&nbsp;propos"
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index c6c0d1fe..099580ae 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -1575,34 +1575,33 @@ msgid ""
 msgstr ""
 
 #: common/navigation.inc.j2:12
-msgid "<a href='/'>Home</a>"
-msgstr "<a href='/'>Home</a>"
+msgid "Home"
+msgstr "Home"
 
 #: common/navigation.inc.j2:13
-msgid "<a href='https://demo.taler.net/' target='_blank'>Demo</a>"
-msgstr "<a href='https://demo.taler.net/' target='_blank'>Demo</a>"
+msgid "Demo"
+msgstr "Demo"
 
 #: common/navigation.inc.j2:14
-msgid "<a href='/citizens'>Citizens</a>"
-msgstr "<a href='/citizens'>Cittadini</a>"
+msgid "Citizens"
+msgstr "Cittadini"
 
 #: common/navigation.inc.j2:15
-msgid "<a href='/merchants'>Merchants</a>"
-msgstr "<a href='/merchants'>Venditori</a>"
+msgid "Merchants"
+msgstr "Venditori"
 
 #: common/navigation.inc.j2:16
-msgid "<a href='/governments'>Governments</a>"
-msgstr "<a href='/governments'>Governi</a>"
+msgid "Governments"
+msgstr "Governi"
 
 #: common/navigation.inc.j2:17
-msgid "<a href='/investors'>Operators</a>"
-msgstr "<a href='/investors'>Investitori</a>"
+msgid "Operators"
+msgstr "Investitori"
 
 #: common/navigation.inc.j2:18
-msgid "<a href='/developers'>Developers</a>"
-msgstr "<a href='/developers'>Sviluppatori</a>"
+msgid "Developers"
+msgstr "Sviluppatori"
 
 #: common/navigation.inc.j2:19
-msgid "<a href='/about'>About&nbsp;us</a>"
-msgstr "<a href='/about'>Chi siamo</a>"
-
+msgid "About&nbsp;us"
+msgstr "Chi siamo"