resolving merge conflicts

1 files changed, 12 insertions, 12 deletions

diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index fb1a08dc..8678b25a 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -2,42 +2,42 @@
   <div class="container-fluid">
     <ul class="nav navbar-nav">
       <li class="{{ 'active' if filename == 'index.html' else '' }}"><a class="taler_home" href="index.html">Taler</a></li>
-      <li class="{{ 'active' if filename == 'citizens.html' else '' }}"><a href="citizens.html">{{ _("Citizens") }}</a></li>
-      <li class="{{ 'active' if filename == 'merchants.html' else '' }}"><a href="merchants.html">{{ _("Merchants") }}</a></li>
+      <li class="{{ 'active' if filename == 'citizens.html' else '' }}"><a href="citizens.html">{{ _("Citizens") }} </a></li>
+      <li class="{{ 'active' if filename == 'merchants.html' else '' }}"><a href="merchants.html">{{ _("Merchants") }} </a></li>
       <li class="{{ 'active' if filename == 'governments.html' else '' }}"><a href="governments.html">{{ _("Governments") }}</a></li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ _("Resources") }} <span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li><a href="architecture.html">{{ _("System Architecture") }} </a></li>
+          <li><a href="architecture.html">{{ _("System Architecture") }}</a></li>
           <li><a href="faq.html">{{ _("FAQ") }}</a></li>
           <li><a href="glossary.html">{{ _("Glossary") }}</a></li>
-          <li><a href="developers.html">{{ _("Developer Introduction") }}</a></li>
-          <li><a href="copyright.html">{{ _("Copyright for Contributors") }}</a></li>
+          <li><a href="developers.html">{{ _("Developer Introduction") }} </a></li>
+          <li><a href="copyright.html">{{ _("Copyright for Contributors") }} </a></li>
           <li><a href="bibliography.html">{{ _("Bibliography") }}</a></li>
         </ul>
       </li>
     </ul>
-    <ul class="nav navbar-right navbar-form">
+    <ul class="nav navbar-right">
       <li>
         <button class="btn btn-dark dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-          <img src="{{ url('images/'+lang+'.png') }}" alt="{{lang}}" />
+          <img  src="{{ url('images/languageicon.svg') }}" height="35" alt="[{{lang}}]" /> {{ lang_full }} [{{ lang }}]
           <span class="caret"></span>
         </button>
         <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
           <li>
-           <a href="{{ self_localized('en') }}"><img src="{{ url('images/gb.png') }}" height="15" width="23" alt="English">English</a>
+           <a href="{{ self_localized('en') }}">English [en]</a>
           </li>
           <li>
-           <a href="{{ self_localized('de') }}"><img src="{{ url('images/de.png') }}" height="15" width="25" alt="Deutsch">Deutsch</a>
+           <a href="{{ self_localized('de') }}">Deutsch [de]</a>
           </li>
           <li>
-           <a href="{{ self_localized('fr') }}"><img src="{{ url('images/fr.png') }}" height="15" width="22" alt="Français">Français</a>
+           <a href="{{ self_localized('fr') }}">Français [fr]</a>
           </li>
           <li>
-           <a href="{{ self_localized('it') }}"><img src="{{ url('images/it.png') }}" height="15" width="22" alt="Italiano">Italiano</a>
+           <a href="{{ self_localized('it') }}">Italiano [it]</a>
           </li>
           <li>
-           <a href="{{ self_localized('es') }}"><img src="{{ url('images/es.png') }}" height="15" width="23" alt="Español">Español</a>
+           <a href="{{ self_localized('es') }}">Español [es]</a>
           </li>
         </ul>
       </li>