diff --git a/.tx/config b/.tx/config
index 4d62faab..c93117f6 100644
--- a/.tx/config
+++ b/.tx/config
@@ -8,7 +8,7 @@ source_lang = en
 type = YML
 
 [silverstripe-cms.master-js]
-file_filter = client/lang/src/<lang>.js
-source_file = client/lang/src/en.js
+file_filter = client/lang/src/<lang>.json
+source_file = client/lang/src/en.json
 source_lang = en
-type = KEYVALUEJSON
\ No newline at end of file
+type = KEYVALUEJSON
diff --git a/client/lang/en.js b/client/lang/en.js
index 86f89be0..94d09533 100644
--- a/client/lang/en.js
+++ b/client/lang/en.js
@@ -11,6 +11,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "CMS.ConfirmRestoreFromLive": "Are you sure you want to revert draft to when the page was last published?",
     "CMS.Duplicate": "Duplicate",
     "CMS.EditPage": "Edit",
+    "CMS.LINKLABEL_PAGE": "Link to page",
     "CMS.ONLYSELECTTWO": "You can only compare two versions at this time.",
     "CMS.Restore": "Are you sure you want to restore this page from archive?",
     "CMS.RestoreToRoot": "Are you sure you want to restore this page from archive?\n\nBecause the parent page is not available this will be restored to the top level.",
@@ -22,4 +23,4 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "CMS.UpdateURL": "Update URL",
     "CMS.ViewPage": "View"
 });
-}
\ No newline at end of file
+}
diff --git a/client/lang/src/af.js b/client/lang/src/af.json
similarity index 100%
rename from client/lang/src/af.js
rename to client/lang/src/af.json
diff --git a/client/lang/src/ar.js b/client/lang/src/ar.json
similarity index 100%
rename from client/lang/src/ar.js
rename to client/lang/src/ar.json
diff --git a/client/lang/src/ast.js b/client/lang/src/ast.json
similarity index 100%
rename from client/lang/src/ast.js
rename to client/lang/src/ast.json
diff --git a/client/lang/src/az.js b/client/lang/src/az.json
similarity index 100%
rename from client/lang/src/az.js
rename to client/lang/src/az.json
diff --git a/client/lang/src/bg.js b/client/lang/src/bg.json
similarity index 100%
rename from client/lang/src/bg.js
rename to client/lang/src/bg.json
diff --git a/client/lang/src/bs.js b/client/lang/src/bs.json
similarity index 100%
rename from client/lang/src/bs.js
rename to client/lang/src/bs.json
diff --git a/client/lang/src/ca.js b/client/lang/src/ca.json
similarity index 100%
rename from client/lang/src/ca.js
rename to client/lang/src/ca.json
diff --git a/client/lang/src/cs.js b/client/lang/src/cs.json
similarity index 100%
rename from client/lang/src/cs.js
rename to client/lang/src/cs.json
diff --git a/client/lang/src/cs_CZ.js b/client/lang/src/cs_CZ.json
similarity index 100%
rename from client/lang/src/cs_CZ.js
rename to client/lang/src/cs_CZ.json
diff --git a/client/lang/src/da.js b/client/lang/src/da.json
similarity index 100%
rename from client/lang/src/da.js
rename to client/lang/src/da.json
diff --git a/client/lang/src/de.js b/client/lang/src/de.json
similarity index 100%
rename from client/lang/src/de.js
rename to client/lang/src/de.json
diff --git a/client/lang/src/de_DE.js b/client/lang/src/de_DE.json
similarity index 100%
rename from client/lang/src/de_DE.js
rename to client/lang/src/de_DE.json
diff --git a/client/lang/src/el.js b/client/lang/src/el.json
similarity index 100%
rename from client/lang/src/el.js
rename to client/lang/src/el.json
diff --git a/client/lang/src/zh_TW.js b/client/lang/src/en.json
similarity index 92%
rename from client/lang/src/zh_TW.js
rename to client/lang/src/en.json
index 65edb7f5..ae927a89 100644
--- a/client/lang/src/zh_TW.js
+++ b/client/lang/src/en.json
@@ -4,6 +4,8 @@
     "CMS.ConfirmRestoreFromLive": "Are you sure you want to revert draft to when the page was last published?",
     "CMS.Duplicate": "Duplicate",
     "CMS.EditPage": "Edit",
+    "CMS.LINK_PAGE": "Insert page link",
+    "CMS.LINKLABEL_PAGE": "Link to page",
     "CMS.ONLYSELECTTWO": "You can only compare two versions at this time.",
     "CMS.Restore": "Are you sure you want to restore this page from archive?",
     "CMS.RestoreToRoot": "Are you sure you want to restore this page from archive?\n\nBecause the parent page is not available this will be restored to the top level.",
@@ -14,4 +16,4 @@
     "CMS.Unpublish": "Are you sure you want to remove your page from the published site?\n\nThis page will still be available in the sitetree as draft.",
     "CMS.UpdateURL": "Update URL",
     "CMS.ViewPage": "View"
-}
\ No newline at end of file
+}
diff --git a/client/lang/src/en.js b/client/lang/src/en_GB.json
similarity index 100%
rename from client/lang/src/en.js
rename to client/lang/src/en_GB.json
diff --git a/client/lang/src/eo.js b/client/lang/src/eo.json
similarity index 100%
rename from client/lang/src/eo.js
rename to client/lang/src/eo.json
diff --git a/client/lang/src/es.js b/client/lang/src/es.json
similarity index 100%
rename from client/lang/src/es.js
rename to client/lang/src/es.json
diff --git a/client/lang/src/en_GB.js b/client/lang/src/es_AR.json
similarity index 100%
rename from client/lang/src/en_GB.js
rename to client/lang/src/es_AR.json
diff --git a/client/lang/src/es_AR.js b/client/lang/src/es_MX.json
similarity index 100%
rename from client/lang/src/es_AR.js
rename to client/lang/src/es_MX.json
diff --git a/client/lang/src/es_MX.js b/client/lang/src/et_EE.json
similarity index 100%
rename from client/lang/src/es_MX.js
rename to client/lang/src/et_EE.json
diff --git a/client/lang/src/et_EE.js b/client/lang/src/fa.json
similarity index 100%
rename from client/lang/src/et_EE.js
rename to client/lang/src/fa.json
diff --git a/client/lang/src/fa_IR.js b/client/lang/src/fa_IR.json
similarity index 100%
rename from client/lang/src/fa_IR.js
rename to client/lang/src/fa_IR.json
diff --git a/client/lang/src/fi.js b/client/lang/src/fi.json
similarity index 100%
rename from client/lang/src/fi.js
rename to client/lang/src/fi.json
diff --git a/client/lang/src/fa.js b/client/lang/src/fi_FI.json
similarity index 100%
rename from client/lang/src/fa.js
rename to client/lang/src/fi_FI.json
diff --git a/client/lang/src/fi_FI.js b/client/lang/src/fo.json
similarity index 100%
rename from client/lang/src/fi_FI.js
rename to client/lang/src/fo.json
diff --git a/client/lang/src/fr.js b/client/lang/src/fr.json
similarity index 100%
rename from client/lang/src/fr.js
rename to client/lang/src/fr.json
diff --git a/client/lang/src/fo.js b/client/lang/src/gl_ES.json
similarity index 100%
rename from client/lang/src/fo.js
rename to client/lang/src/gl_ES.json
diff --git a/client/lang/src/gl_ES.js b/client/lang/src/he_IL.json
similarity index 100%
rename from client/lang/src/gl_ES.js
rename to client/lang/src/he_IL.json
diff --git a/client/lang/src/he_IL.js b/client/lang/src/hi.json
similarity index 100%
rename from client/lang/src/he_IL.js
rename to client/lang/src/hi.json
diff --git a/client/lang/src/hr.js b/client/lang/src/hr.json
similarity index 100%
rename from client/lang/src/hr.js
rename to client/lang/src/hr.json
diff --git a/client/lang/src/hu.js b/client/lang/src/hu.json
similarity index 100%
rename from client/lang/src/hu.js
rename to client/lang/src/hu.json
diff --git a/client/lang/src/hi.js b/client/lang/src/hy_AM.json
similarity index 100%
rename from client/lang/src/hi.js
rename to client/lang/src/hy_AM.json
diff --git a/client/lang/src/id.js b/client/lang/src/id.json
similarity index 100%
rename from client/lang/src/id.js
rename to client/lang/src/id.json
diff --git a/client/lang/src/hy_AM.js b/client/lang/src/id_ID.json
similarity index 100%
rename from client/lang/src/hy_AM.js
rename to client/lang/src/id_ID.json
diff --git a/client/lang/src/is.js b/client/lang/src/is.json
similarity index 100%
rename from client/lang/src/is.js
rename to client/lang/src/is.json
diff --git a/client/lang/src/it.js b/client/lang/src/it.json
similarity index 100%
rename from client/lang/src/it.js
rename to client/lang/src/it.json
diff --git a/client/lang/src/id_ID.js b/client/lang/src/it_IT.json
similarity index 100%
rename from client/lang/src/id_ID.js
rename to client/lang/src/it_IT.json
diff --git a/client/lang/src/ja.js b/client/lang/src/ja.json
similarity index 100%
rename from client/lang/src/ja.js
rename to client/lang/src/ja.json
diff --git a/client/lang/src/it_IT.js b/client/lang/src/ja_JP.json
similarity index 100%
rename from client/lang/src/it_IT.js
rename to client/lang/src/ja_JP.json
diff --git a/client/lang/src/ja_JP.js b/client/lang/src/km.json
similarity index 100%
rename from client/lang/src/ja_JP.js
rename to client/lang/src/km.json
diff --git a/client/lang/src/ko.js b/client/lang/src/ko.json
similarity index 100%
rename from client/lang/src/ko.js
rename to client/lang/src/ko.json
diff --git a/client/lang/src/lt.js b/client/lang/src/lt.json
similarity index 100%
rename from client/lang/src/lt.js
rename to client/lang/src/lt.json
diff --git a/client/lang/src/km.js b/client/lang/src/lt_LT.json
similarity index 100%
rename from client/lang/src/km.js
rename to client/lang/src/lt_LT.json
diff --git a/client/lang/src/lt_LT.js b/client/lang/src/lv.json
similarity index 100%
rename from client/lang/src/lt_LT.js
rename to client/lang/src/lv.json
diff --git a/client/lang/src/mi.js b/client/lang/src/mi.json
similarity index 100%
rename from client/lang/src/mi.js
rename to client/lang/src/mi.json
diff --git a/client/lang/src/lv.js b/client/lang/src/ms.json
similarity index 100%
rename from client/lang/src/lv.js
rename to client/lang/src/ms.json
diff --git a/client/lang/src/ms.js b/client/lang/src/my.json
similarity index 100%
rename from client/lang/src/ms.js
rename to client/lang/src/my.json
diff --git a/client/lang/src/nb.js b/client/lang/src/nb.json
similarity index 100%
rename from client/lang/src/nb.js
rename to client/lang/src/nb.json
diff --git a/client/lang/src/my.js b/client/lang/src/nb_NO.json
similarity index 100%
rename from client/lang/src/my.js
rename to client/lang/src/nb_NO.json
diff --git a/client/lang/src/nb_NO.js b/client/lang/src/ne.json
similarity index 100%
rename from client/lang/src/nb_NO.js
rename to client/lang/src/ne.json
diff --git a/client/lang/src/nl.js b/client/lang/src/nl.json
similarity index 100%
rename from client/lang/src/nl.js
rename to client/lang/src/nl.json
diff --git a/client/lang/src/ne.js b/client/lang/src/nl_NL.json
similarity index 100%
rename from client/lang/src/ne.js
rename to client/lang/src/nl_NL.json
diff --git a/client/lang/src/nl_NL.js b/client/lang/src/pa.json
similarity index 100%
rename from client/lang/src/nl_NL.js
rename to client/lang/src/pa.json
diff --git a/client/lang/src/pl.js b/client/lang/src/pl.json
similarity index 100%
rename from client/lang/src/pl.js
rename to client/lang/src/pl.json
diff --git a/client/lang/src/pa.js b/client/lang/src/pl_PL.json
similarity index 100%
rename from client/lang/src/pa.js
rename to client/lang/src/pl_PL.json
diff --git a/client/lang/src/pl_PL.js b/client/lang/src/pt.json
similarity index 100%
rename from client/lang/src/pl_PL.js
rename to client/lang/src/pt.json
diff --git a/client/lang/src/pt.js b/client/lang/src/pt_BR.json
similarity index 100%
rename from client/lang/src/pt.js
rename to client/lang/src/pt_BR.json
diff --git a/client/lang/src/pt_BR.js b/client/lang/src/pt_PT.json
similarity index 100%
rename from client/lang/src/pt_BR.js
rename to client/lang/src/pt_PT.json
diff --git a/client/lang/src/ro.js b/client/lang/src/ro.json
similarity index 100%
rename from client/lang/src/ro.js
rename to client/lang/src/ro.json
diff --git a/client/lang/src/pt_PT.js b/client/lang/src/ro_RO.json
similarity index 100%
rename from client/lang/src/pt_PT.js
rename to client/lang/src/ro_RO.json
diff --git a/client/lang/src/ru.js b/client/lang/src/ru.json
similarity index 100%
rename from client/lang/src/ru.js
rename to client/lang/src/ru.json
diff --git a/client/lang/src/ro_RO.js b/client/lang/src/si.json
similarity index 100%
rename from client/lang/src/ro_RO.js
rename to client/lang/src/si.json
diff --git a/client/lang/src/sk.js b/client/lang/src/sk.json
similarity index 100%
rename from client/lang/src/sk.js
rename to client/lang/src/sk.json
diff --git a/client/lang/src/si.js b/client/lang/src/sk_SK.json
similarity index 100%
rename from client/lang/src/si.js
rename to client/lang/src/sk_SK.json
diff --git a/client/lang/src/sl.js b/client/lang/src/sl.json
similarity index 100%
rename from client/lang/src/sl.js
rename to client/lang/src/sl.json
diff --git a/client/lang/src/sk_SK.js b/client/lang/src/sl_SI.json
similarity index 100%
rename from client/lang/src/sk_SK.js
rename to client/lang/src/sl_SI.json
diff --git a/client/lang/src/sr.js b/client/lang/src/sr.json
similarity index 100%
rename from client/lang/src/sr.js
rename to client/lang/src/sr.json
diff --git a/client/lang/src/sl_SI.js b/client/lang/src/sr@latin.json
similarity index 100%
rename from client/lang/src/sl_SI.js
rename to client/lang/src/sr@latin.json
diff --git a/client/lang/src/sr@latin.js b/client/lang/src/sr_RS.json
similarity index 100%
rename from client/lang/src/sr@latin.js
rename to client/lang/src/sr_RS.json
diff --git a/client/lang/src/sr_RS@latin.js b/client/lang/src/sr_RS@latin.json
similarity index 100%
rename from client/lang/src/sr_RS@latin.js
rename to client/lang/src/sr_RS@latin.json
diff --git a/client/lang/src/sv.js b/client/lang/src/sv.json
similarity index 100%
rename from client/lang/src/sv.js
rename to client/lang/src/sv.json
diff --git a/client/lang/src/sr_RS.js b/client/lang/src/th.json
similarity index 100%
rename from client/lang/src/sr_RS.js
rename to client/lang/src/th.json
diff --git a/client/lang/src/th.js b/client/lang/src/tl.json
similarity index 100%
rename from client/lang/src/th.js
rename to client/lang/src/tl.json
diff --git a/client/lang/src/tl.js b/client/lang/src/tr.json
similarity index 100%
rename from client/lang/src/tl.js
rename to client/lang/src/tr.json
diff --git a/client/lang/src/tr.js b/client/lang/src/tr_TR.json
similarity index 100%
rename from client/lang/src/tr.js
rename to client/lang/src/tr_TR.json
diff --git a/client/lang/src/tr_TR.js b/client/lang/src/uk.json
similarity index 100%
rename from client/lang/src/tr_TR.js
rename to client/lang/src/uk.json
diff --git a/client/lang/src/uk.js b/client/lang/src/uk_UA.json
similarity index 100%
rename from client/lang/src/uk.js
rename to client/lang/src/uk_UA.json
diff --git a/client/lang/src/uk_UA.js b/client/lang/src/uz.json
similarity index 100%
rename from client/lang/src/uk_UA.js
rename to client/lang/src/uz.json
diff --git a/client/lang/src/uz.js b/client/lang/src/vi.json
similarity index 100%
rename from client/lang/src/uz.js
rename to client/lang/src/vi.json
diff --git a/client/lang/src/vi.js b/client/lang/src/vi_VN.json
similarity index 100%
rename from client/lang/src/vi.js
rename to client/lang/src/vi_VN.json
diff --git a/client/lang/src/zh.js b/client/lang/src/zh.json
similarity index 100%
rename from client/lang/src/zh.js
rename to client/lang/src/zh.json
diff --git a/client/lang/src/vi_VN.js b/client/lang/src/zh_CN.json
similarity index 100%
rename from client/lang/src/vi_VN.js
rename to client/lang/src/zh_CN.json
diff --git a/client/lang/src/zh_CN.js b/client/lang/src/zh_TW.json
similarity index 100%
rename from client/lang/src/zh_CN.js
rename to client/lang/src/zh_TW.json