From: Jack Allnutt <jack@allnutt.eu>
Date: Sun, 21 Jul 2013 21:18:05 +0000 (+0100)
Subject: Merge branch 'i18n' into development
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e70e1023588ff459a87fa78716caeb32f4994b9f;p=KiwiIRC.git

Merge branch 'i18n' into development
---

e70e1023588ff459a87fa78716caeb32f4994b9f
diff --cc client/assets/src/index.html.tmpl
index a066513,7324b0f..c33b2a4
--- a/client/assets/src/index.html.tmpl
+++ b/client/assets/src/index.html.tmpl
@@@ -142,7 -142,7 +142,7 @@@
                              </tr>
                          </table>
  
-                         <a href="" onclick="return false;" class="show_more">Server and network <i class="icon-caret-down"></i></a>
 -                        <a href="" onclick="return false;" class="show_more"><%= server_network %></a>
++                        <a href="" onclick="return false;" class="show_more"><%= server_network %> <i class="icon-caret-down"></i></a>
                      </div>
  
  
diff --cc package.json
index 05b9e6c,e76397d..e7c34da
--- a/package.json
+++ b/package.json
@@@ -21,8 -21,8 +21,9 @@@
      "daemonize2": "0.4.0-rc.5",
      "eventemitter2": "0.4.11",
      "ipaddr.js": "0.1.1",
 -    "socksjs": "0.3.3",
 +    "socksjs": "0.4.1",
      "iconv-lite" : "0.2.10",
-     "spdy": "1.9.1"
++    "spdy": "1.9.1",
+     "po2json": "0.0.6"
    }
  }