diff --git a/themes/qgis-theme/docs_index.html b/themes/qgis-theme/docs_index.html
index b9b3e06753..c9a0917f0d 100644
--- a/themes/qgis-theme/docs_index.html
+++ b/themes/qgis-theme/docs_index.html
@@ -56,19 +56,19 @@ <h3>{{ _('DOCUMENTATION') }}</h3>
                 <h3>{{ _('QGIS 2.2') }}</h3>
                 <p>For users:
                     <ul>
-                        <li>{{ _('Get the') }} <a href="http://docs.qgis.org/2.2/en/docs/user_manual" target="_blank" >{{ _('QGIS User guide') }}</a> (<a href="http://docs.qgis.org/2.2/pdf/en/QGIS-2.2-UserGuide-en.pdf">PDF</a>)</li>
-                        <li>{{ _('Follow the tutorials in the') }} <a href="http://docs.qgis.org/2.2/en/docs/training_manual/"  target="_blank">{{ _('QGIS Training manual') }}</a> (<a href="http://docs.qgis.org/2.2/pdf/en/QGIS-2.2-QGISTrainingManual-en.pdf">PDF</a>)</li>
-                        <li>{{ _('Learn GIS basics in') }} <a href="http://docs.qgis.org/2.2/en/docs/gentle_gis_introduction"  target="_blank">{{ _('A gentle introduction in GIS') }}</a></li>
+                        <li>{{ _('Get the') }} <a href="http://docs.qgis.org/2.2/{{language}}/docs/user_manual" target="_blank" >{{ _('QGIS User guide') }}</a> (<a href="http://docs.qgis.org/2.2/pdf/{{language}}/QGIS-2.2-UserGuide-en.pdf">PDF</a>)</li>
+                        <li>{{ _('Follow the tutorials in the') }} <a href="http://docs.qgis.org/2.2/{{language}}/docs/training_manual/"  target="_blank">{{ _('QGIS Training manual') }}</a> (<a href="http://docs.qgis.org/2.2/pdf/{{language}}/QGIS-2.2-QGISTrainingManual-en.pdf">PDF</a>)</li>
+                        <li>{{ _('Learn GIS basics in') }} <a href="http://docs.qgis.org/2.2/{{language}}/docs/gentle_gis_introduction"  target="_blank">{{ _('A gentle introduction in GIS') }}</a></li>
                     </ul>
                 </p>
                 <p>For documentation writers:
                     <ul>
-                        <li>{{ _('Learn how to write docs using the') }} <a href="http://docs.qgis.org/2.2/en/docs/documentation_guidelines" target="_blank" >{{ _('Documentation Guidelines') }}</a></li>
+                        <li>{{ _('Learn how to write docs using the') }} <a href="http://docs.qgis.org/2.2/{{language}}/docs/documentation_guidelines" target="_blank" >{{ _('Documentation Guidelines') }}</a></li>
                     </ul>
                 </p>
                 <p>For developers:
                     <ul>
-                        <li>{{ _('Go Python, study the') }} <a href="http://docs.qgis.org/2.2/en/docs/pyqgis_developer_cookbook/"  target="_blank">{{ _('PyQGIS cookbook (for plugins and scripting)') }}</a> (<a href="http://docs.qgis.org/2.2/pdf/en/QGIS-2.2-PyQGISDeveloperCookbook-en.pdf">PDF</a>) </li>
+                        <li>{{ _('Go Python, study the') }} <a href="http://docs.qgis.org/2.2/{{language}}/docs/pyqgis_developer_cookbook/"  target="_blank">{{ _('PyQGIS cookbook (for plugins and scripting)') }}</a> (<a href="http://docs.qgis.org/2.2/pdf/{{language}}/QGIS-2.2-PyQGISDeveloperCookbook-en.pdf">PDF</a>) </li>
                         <li><a href="http://qgis.org/api/2.2/classQgisInterface.html" target="_blank" class="reference external">{{ _('Python (iface) Api documentation') }}</a></li>
                         <li> <a href="http://qgis.org/api/2.2/" target="_blank" class="reference external">{{ _('C++ Api documentation') }}</a></li>
                     </ul>
@@ -82,11 +82,11 @@ <h3>{{ _('QGIS 2.2') }}</h3>
             <div class="offset1 span5">
                 <h3>{{ _('QGIS 2.0') }}</h3>
                 <p>{{ _('We keep a copy of the documentation of QGIS 2.0 around here:') }} <a href="http://docs.qgis.org/2.0" target="_blank" class="reference external">{{ _('http://docs.qgis.org/2.0') }}</a></p>
-                <p>{{ _('Read the') }} <a href="http://docs.qgis.org/2.0/en/docs/user_manual" >{{ _('QGIS User guide/Manual') }}</a></p>
-                <p>{{ _('Do the QGIS training:') }} <a href="http://docs.qgis.org/2.0/en/docs/training_manual/" >{{ _('QGIS Training manual') }}</a></p>
-                <p>{{ _('Go Python, study the') }} <a href="http://docs.qgis.org/2.0/en/docs/pyqgis_developer_cookbook/" >{{ _('PyQGIS cookbook (for plugins and scripting)') }}</a></p>
-                <p>{{ _('Learn how to write docs in') }} <a href="http://docs.qgis.org/2.0/en/docs/documentation_guidelines" >{{ _('Documentation Guidelines') }}</a></p>
-                <p>{{ _('Intro GIS in') }} <a href="http://docs.qgis.org/2.0/en/docs/gentle_gis_introduction" >{{ _('A gentle introduction in GIS') }}</a></p>
+                <p>{{ _('Read the') }} <a href="http://docs.qgis.org/2.0/{{language}}/docs/user_manual" >{{ _('QGIS User guide/Manual') }}</a></p>
+                <p>{{ _('Do the QGIS training:') }} <a href="http://docs.qgis.org/2.0/{{language}}/docs/training_manual/" >{{ _('QGIS Training manual') }}</a></p>
+                <p>{{ _('Go Python, study the') }} <a href="http://docs.qgis.org/2.0/{{language}}/docs/pyqgis_developer_cookbook/" >{{ _('PyQGIS cookbook (for plugins and scripting)') }}</a></p>
+                <p>{{ _('Learn how to write docs in') }} <a href="http://docs.qgis.org/2.0/{{language}}/docs/documentation_guidelines" >{{ _('Documentation Guidelines') }}</a></p>
+                <p>{{ _('Intro GIS in') }} <a href="http://docs.qgis.org/2.0/{{language}}/docs/gentle_gis_introduction" >{{ _('A gentle introduction in GIS') }}</a></p>
                 <p>{{ _('PDF versions of all above, eg for printing are available here:') }} <a href="http://docs.qgis.org/2.0/pdf" target="_blank" class="reference external">{{ _('http://docs.qgis.org/2.0/pdf') }}</a></p>
                 <p><a href="http://qgis.org/api/2.0/" target="_blank" class="reference external">{{ _('C++ Api documentation') }}</a></p>
                 <p><a href="http://qgis.org/api/2.0/classQgisInterface.html" target="_blank" class="reference external">{{ _('Python (iface) Api documentation') }}</a></p>
@@ -107,10 +107,10 @@ <h3>{{ _('QGIS 2.0') }}</h3>
             <div class="span5">
                 <h3>{{ _('QGIS 1.8') }}</h3>
                 <p>{{ _('We keep a copy of the documentation of QGIS 1.8 around here:') }} <a href="http://docs.qgis.org/1.8" target="_blank" class="reference external">{{ _('http://docs.qgis.org/1.8') }}</a></p>
-                <p><a href="http://docs.qgis.org/1.8/en/docs/user_manual" target="_blank" class="reference external">{{ _('User guide/Manual') }}</a></p>
-                <p><a href="http://docs.qgis.org/1.8/en/docs/pyqgis_developer_cookbook" target="_blank" class="reference external">{{ _('PyQGIS cookbook') }}</a></p>
-                <p><a href="http://docs.qgis.org/1.8/en/docs/documentation_guidelines" target="_blank" class="reference external">{{ _('Documentation Guidelines (how to write the docs)') }}</a></p>
-                <p><a href="http://docs.qgis.org/1.8/en/docs/gentle_gis_introduction/" target="_blank" class="reference external">{{ _('A gentle introduction in GIS') }}</a></p>
+                <p><a href="http://docs.qgis.org/1.8/{{language}}/docs/user_manual" target="_blank" class="reference external">{{ _('User guide/Manual') }}</a></p>
+                <p><a href="http://docs.qgis.org/1.8/{{language}}/docs/pyqgis_developer_cookbook" target="_blank" class="reference external">{{ _('PyQGIS cookbook') }}</a></p>
+                <p><a href="http://docs.qgis.org/1.8/{{language}}/docs/documentation_guidelines" target="_blank" class="reference external">{{ _('Documentation Guidelines (how to write the docs)') }}</a></p>
+                <p><a href="http://docs.qgis.org/1.8/{{language}}/docs/gentle_gis_introduction/" target="_blank" class="reference external">{{ _('A gentle introduction in GIS') }}</a></p>
                 <p>{{ _('PDF versions of all above, eg for printing are available here: ') }} <a href="http://docs.qgis.org/1.8/pdf" target="_blank" class="reference external">{{ _('http://docs.qgis.org/1.8/pdf') }}</a></p>
                 <!-- <h4 class="subsection-link"> <a href="{{ pathto('site/getinvolved/translate') }}">{{ _('Translate QGIS into your Language') }}</a> </h4>-->
                 <p><a href="http://qgis.org/api/1.8/" target="_blank" class="reference external">{{ _('C++ Api documentation') }}</a></p>
@@ -125,12 +125,12 @@ <h3>{{ _('QGIS 1.8') }}</h3>
             <div class="offset1 span5">
                 <h3>{{ _('for QGIS testing') }}</h3>
                 <p>{{ _("Although not translated we also build the documentation for QGIS which is currently developed. We call this version 'QGIS testing' and documentation can be found here: ") }} <a href="http://docs.qgis.org/testing" target="_blank" class="reference external">{{ _('http://docs.qgis.org/testing') }}</a></p>
-                <p><a href="http://docs.qgis.org/testing/en/docs/user_manual" target="_blank" class="reference external">{{ _('User guide/Manual') }}</a></p>
+                <p><a href="http://docs.qgis.org/testing/{{language}}/docs/user_manual" target="_blank" class="reference external">{{ _('User guide/Manual') }}</a></p>
                 <p><a href="http://docs.qgis.org/testing/training_manual/" >{{ _('QGIS Training manual') }}</a></p>
-                <p><a href="http://docs.qgis.org/testing/en/docs/pyqgis_developer_cookbook" target="_blank" class="reference external">{{ _('PyQGIS cookbook') }}</a></p>
-                <p><a href="http://docs.qgis.org/testing/en/docs/documentation_guidelines" target="_blank" class="reference external">{{ _('Documentation Guidelines (how to write the docs)') }}</a></p>
+                <p><a href="http://docs.qgis.org/testing/{{language}}/docs/pyqgis_developer_cookbook" target="_blank" class="reference external">{{ _('PyQGIS cookbook') }}</a></p>
+                <p><a href="http://docs.qgis.org/testing/{{language}}/docs/documentation_guidelines" target="_blank" class="reference external">{{ _('Documentation Guidelines (how to write the docs)') }}</a></p>
                 <p><a href="http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html">Building QGIS from Source</a></p>
-                <p><a href="http://docs.qgis.org/testing/en/docs/gentle_gis_introduction/" target="_blank" class="reference external">{{ _('A gentle introduction in GIS') }}</a></p>
+                <p><a href="http://docs.qgis.org/testing/{{language}}/docs/gentle_gis_introduction/" target="_blank" class="reference external">{{ _('A gentle introduction in GIS') }}</a></p>
                 <p>{{ _('PDF versions of all above, eg for printing are available here: ') }} <a href="http://docs.qgis.org/testing/pdf" class="reference external" target="_blank">{{ _('http://docs.qgis.org/testing/pdf') }}</a></p>
                 <p><a href="http://qgis.org/api/" target="_blank" class="reference external">{{ _('C++ Api documentation') }}</a></p>
                 <p><a href="http://qgis.org/api/classQgisInterface.html" target="_blank" class="reference external">{{ _('Python (iface) Api documentation') }}</a></p>
diff --git a/themes/qgis-theme/forusers_index.html b/themes/qgis-theme/forusers_index.html
index 3837961ba5..aa151fb6d4 100644
--- a/themes/qgis-theme/forusers_index.html
+++ b/themes/qgis-theme/forusers_index.html
@@ -109,12 +109,12 @@ <h3>{{ _('QGIS Documentation') }}</h3>
                 <p>{{ _('The User manual contains all documentation needed for a user to get started. The documentation is updated with every update of QGIS.') }}
                 </p>
                 <h4>
-                    <a href="http://docs.qgis.org/{{version}}/en/docs/user_manual/index.html">{{ _('Read QGIS Documentation') }}</a>
+                    <a href="http://docs.qgis.org/{{version}}/{{language}}/docs/user_manual/index.html">{{ _('Read QGIS Documentation') }}</a>
                 </h4>
                 <p>{{ _('Another good guide to getting started is:') }}
                 </p>
                 <h4>
-                    <a href="http://docs.qgis.org/{{version}}/en/docs/gentle_gis_introduction/index.html">{{ _('A Gentle Introduction to GIS') }}</a>
+                    <a href="http://docs.qgis.org/{{version}}/{{language}}/docs/gentle_gis_introduction/index.html">{{ _('A Gentle Introduction to GIS') }}</a>
                 </h4>
 
             </div>