Issue 5636 - Changed navbar contents

templates/default.tmpl

Index: templates/default.tmpl
===================================================================
--- a/templates/default.tmpl
+++ b/templates/default.tmpl
@@ -88,30 +88,38 @@
           <span>{{ "Adblock <strong>Plus</strong>" | translate("navbar-logo-text", "Navbar logo text") }}</span>
         </a>
         <a href="#" id="navbar-menu-toggle">
           <img
             src="/img/menu-toggle.png"
             srcset="/img/menu-toggle.svg 2x">
         </a>
         <ul id="navbar-menu">
-          {% for pagename in ["about", "features", "bugs", "contribute"] %}
+          {% for pagename in ["about", "contribute"] %}
             <li>
               {{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a>
             </li>
           {% endfor %}
+          <li>
+            <a href="documentation">{{ get_string("help", "menu") }}</a>
+          </li>
           <li id="navbar-locale-menubar">
-            <a href="#" id="navbar-locale-selected">
-              {{ config.get("langnames", locale) }} ({{ locale | to_og_locale | to_og_location }})
+            <a id="navbar-locale-selected" href="#">
+              <img
+                id="locale-icon"
+                src="/img/globe.png"
+                srcset="/img/globe.svg 2x"
+                aria-hidden="true" />
+                {{ config.get("langnames", locale) }}
             </a>
             <ul id="navbar-locale-menu">
               {% for available_locale in available_locales %}
                 <li>
                   {{ page | linkify(available_locale) }}
-                    {{ config.get("langnames", available_locale) }} ({{ available_locale | to_og_locale | to_og_location }})
+                    {{ config.get("langnames", available_locale) }}
                   </a>
                 </li>
               {% endfor %}
             </ul>{# #navbar-locale-menu #}
           </li>
         </ul>{# #navbar-menu #}
       </div>{# .container #}
     </nav>{# #navbar #}