diff --git a/VERSION b/VERSION
index 3ec94ab6..855c1134 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-07-11 22:00:34) dev
+Version 2.00.0 (2012-07-11 22:05:35) dev
diff --git a/applications/admin/views/default/site.html b/applications/admin/views/default/site.html
index 184b3a93..a31cc758 100644
--- a/applications/admin/views/default/site.html
+++ b/applications/admin/views/default/site.html
@@ -69,7 +69,7 @@
       {{pass}}
       </p>
       <div class="formfield">
-    Running on {{=request.env.server_software}}
+	{{=T("Running on %s", request.env.server_software)}}
       </div>
       <p>{{=button(URL('default','reload_routes'), T('Reload routes'))}}</p>
     </div>
diff --git a/applications/admin/views/layout.html b/applications/admin/views/layout.html
index 8455ea22..79f0efa3 100644
--- a/applications/admin/views/layout.html
+++ b/applications/admin/views/layout.html
@@ -28,17 +28,17 @@
             </div>
         </div>
         <div id="footer" class="fixed">
-            {{=T('Powered by')}} {{=A('web2py', _href='http://www.web2py.com')}}&trade; {{=T('created by')}} Massimo Di Pierro &copy;2007-2011 -
-	    {{if hasattr(T,'get_possible_languages'):}}
-	    <span>
-	      {{=T('Admin language')}}
-	      <select name="adminlanguage" onchange="var date = new Date();cookieDate=date.setTime(date.getTime()+(100*24*60*60*1000));document.cookie='adminLanguage='+this.options[this.selectedIndex].value+'; expires='+cookieDate+'; path=/';window.location.reload()">
-		{{for language in T.get_possible_languages():}}
-		<option {{=T.accepted_language==language and 'selected' or ''}} >{{=language}}</option>
-		{{pass}}
-	      </select>
-	    </span>
-	    {{pass}}
+            {{=T('Powered by')}} {{=A('web2py', _href='http://www.web2py.com')}}&trade; {{=T('created by')}} Massimo Di Pierro &copy;2007-2012 -
+        {{if hasattr(T,'get_possible_languages_info'):}}
+        <span>
+          {{=T('Admin language')}}
+          <select name="adminlanguage" onchange="var date = new Date();cookieDate=date.setTime(date.getTime()+(100*24*60*60*1000));document.cookie='adminLanguage='+this.options[this.selectedIndex].id+'; expires='+cookieDate+'; path=/';window.location.reload()">
+          {{for langinfo in sorted([(code,info[1]) for code,info in T.get_possible_languages_info().iteritems() if code != 'default']):}}
+            <option {{=T.accepted_language==langinfo[0] and 'selected' or ''}} {{='id='+langinfo[0]}} >{{=langinfo[1]}}</option>
+          {{pass}}
+          </select>
+        </span>
+        {{pass}}
         </div>
     </body>
 </html>