Merge branch 'i18n' into development

diff --cc client/assets/src/index.html.tmpl
index a066513c465b305beacab1c8fe02a9df0d675e22,7324b0fc84f669cbb4bb43afe72aa661b93e67c6..c33b2a4ab0fa65d521185a8cd6d5832e93fe6c84
--- 1/client/assets/src/index.html.tmpl
--- 2/client/assets/src/index.html.tmpl
+++ b/client/assets/src/index.html.tmpl
@@@ -142,7 -142,7 +142,7 @@@
                              </tr>\r
                          </table>\r
  \r
-                         <a href="" onclick="return false;" class="show_more">Server and network <i class="icon-caret-down"></i></a>\r
 -                        <a href="" onclick="return false;" class="show_more"><%= server_network %></a>\r
++                        <a href="" onclick="return false;" class="show_more"><%= server_network %> <i class="icon-caret-down"></i></a>\r
                      </div>\r
  \r
  \r

diff --cc client/assets/src/models/application.js
Simple merge

diff --cc client/assets/src/views/serverselect.js
Simple merge

diff --cc package.json
index 05b9e6c6079284d0fa22071f8619566b27ae1f53,e76397d598cf78b2c5e90b73899ac2edc59737f4..e7c34daed2d2e6adcdf7bf314c9c07018a63c5e9
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -21,8 -21,8 +21,9 @@@
      "daemonize2": "0.4.0-rc.5",\r
      "eventemitter2": "0.4.11",\r
      "ipaddr.js": "0.1.1",\r
 -    "socksjs": "0.3.3",\r
 +    "socksjs": "0.4.1",\r
      "iconv-lite" : "0.2.10",\r
-     "spdy": "1.9.1"\r
++    "spdy": "1.9.1",\r
+     "po2json": "0.0.6"\r
    }\r
  }\r