From a2c765a590caf54ccd037448dd0a0b88087e1a85 Mon Sep 17 00:00:00 2001
From: JDGrimes <jdg@codesymphony.co>
Date: Sat, 28 Feb 2015 15:04:27 -0500
Subject: [PATCH] Don't load l10n validator with composer

The WordPoints dev-lib now does this automatically.
---
 composer.json                              |   4 +-
 composer.lock                              |  62 +--
 tools/wp-l10n-validator/cache.json         | 369 +++++++--------
 tools/wp-l10n-validator/ignores-cache.json | 520 +++++++--------------
 wp-l10n-validator.json                     |   2 +-
 5 files changed, 332 insertions(+), 625 deletions(-)

diff --git a/composer.json b/composer.json
index 680a9555..9dbd3cad 100644
--- a/composer.json
+++ b/composer.json
@@ -3,8 +3,6 @@
         "php": ">=5.2.0"
     },
     "require-dev": {
-        "jdgrimes/wp-plugin-uninstall-tester": "~0.4",
-        "jdgrimes/wp-l10n-validator": "dev-master",
-		"wordpoints/l10n-validator-config": "~1.0"
+        "jdgrimes/wp-plugin-uninstall-tester": "~0.4"
     }
 }
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 0b6d6126..c431d39a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,43 +3,9 @@
         "This file locks the dependencies of your project to a known state",
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
     ],
-    "hash": "2b18cb53426361d7e85eedd5f7779053",
+    "hash": "e04a497fc9cee4a513a4aa41fb14c36a",
     "packages": [],
     "packages-dev": [
-        {
-            "name": "jdgrimes/wp-l10n-validator",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/JDGrimes/wp-l10n-validator.git",
-                "reference": "28e32f54fdaf155268d48a83b26bb2c966cbdff7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/JDGrimes/wp-l10n-validator/zipball/28e32f54fdaf155268d48a83b26bb2c966cbdff7",
-                "reference": "28e32f54fdaf155268d48a83b26bb2c966cbdff7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "J.D. Grimes",
-                    "email": "jdg@codesymphony.co",
-                    "homepage": "http://codesymphony.co",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Gettext localization validator for WordPress",
-            "homepage": "https://github.com/JDGrimes/wp-l10n-validator",
-            "time": "2015-01-07 20:43:54"
-        },
         {
             "name": "jdgrimes/wp-plugin-uninstall-tester",
             "version": "0.4.2",
@@ -73,35 +39,11 @@
             "description": "Utilities for testing WordPress plugin install/uninstall with PHPUnit",
             "homepage": "https://github.com/JDGrimes/wp-plugin-uninstall-tester",
             "time": "2014-11-25 14:47:10"
-        },
-        {
-            "name": "wordpoints/l10n-validator-config",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/WordPoints/l10n-validator-config.git",
-                "reference": "b5083fb51c17e3626b8f0279ff920d38f587971b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/WordPoints/l10n-validator-config/zipball/b5083fb51c17e3626b8f0279ff920d38f587971b",
-                "reference": "b5083fb51c17e3626b8f0279ff920d38f587971b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "description": "WordPoints-specific configuration for https://github.com/JDGrimes/wp-l10n-validator",
-            "time": "2015-01-07 22:32:10"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "jdgrimes/wp-l10n-validator": 20
-    },
+    "stability-flags": [],
     "platform": {
         "php": ">=5.2.0"
     },
diff --git a/tools/wp-l10n-validator/cache.json b/tools/wp-l10n-validator/cache.json
index 5ffe1b5b..ab7bf722 100644
--- a/tools/wp-l10n-validator/cache.json
+++ b/tools/wp-l10n-validator/cache.json
@@ -1,7 +1,7 @@
 {
     "\/admin\/admin.php": {
-        "size": 16642,
-        "hash": "4c6c673e7d62daefa05bd228b5c329cf",
+        "size": 16992,
+        "hash": "592e49b3457bca6dd9870c3a2d23ce68",
         "errors": false
     },
     "\/admin\/includes\/class-wordpoints-module-installer-skin.php": {
@@ -15,8 +15,13 @@
         "errors": false
     },
     "\/admin\/includes\/class-wordpoints-modules-list-table.php": {
-        "size": 21942,
-        "hash": "a471c7d554773bf2468312043a4e312b",
+        "size": 21944,
+        "hash": "8895103b08ef01a6da3f830ac3fd7971",
+        "errors": false
+    },
+    "\/admin\/includes\/deprecated.php": {
+        "size": 339,
+        "hash": "8eb0461e028c2bcad1e9281aa4d9df53",
         "errors": false
     },
     "\/admin\/screens\/configure-components-load.php": {
@@ -25,8 +30,13 @@
         "errors": false
     },
     "\/admin\/screens\/configure-components.php": {
-        "size": 5274,
-        "hash": "8b23b741c4770c5a9323b869dc1c8724",
+        "size": 5264,
+        "hash": "5a76e9a84b80036a791be3078918790a",
+        "errors": false
+    },
+    "\/admin\/screens\/configure-settings-load.php": {
+        "size": 1100,
+        "hash": "cc791be8c2d13d6daad4c8d8406ea79e",
         "errors": false
     },
     "\/admin\/screens\/configure-settings.php": {
@@ -45,23 +55,33 @@
         "errors": false
     },
     "\/admin\/screens\/modules-load.php": {
-        "size": 16667,
-        "hash": "b07c9245c3c178a1f68197d405d5c398",
+        "size": 16981,
+        "hash": "c3a558cdbdc2fd79d090acf8dbf59674",
         "errors": false
     },
     "\/admin\/screens\/modules.php": {
-        "size": 4719,
-        "hash": "4218b9dfdb6348095fcce1787c90a2de",
+        "size": 4724,
+        "hash": "7c4679182a848fe41c63d89570cd29d7",
         "errors": false
     },
-    "\/components\/index.php": {
-        "size": 27,
-        "hash": "a3f720aa8693dbbf2c538fde4dc7b2b1",
+    "\/components\/points\/admin\/admin.php": {
+        "size": 13692,
+        "hash": "31102cdcdf8ae9673f122a466825806a",
         "errors": false
     },
-    "\/components\/points\/admin\/admin.php": {
-        "size": 13667,
-        "hash": "a375d0d7ec7ab33fcba902d4d56b114f",
+    "\/components\/points\/admin\/includes\/ajax.php": {
+        "size": 7490,
+        "hash": "65c9fd47d508ad07993ae16129851885",
+        "errors": false
+    },
+    "\/components\/points\/admin\/screens\/hooks-load.php": {
+        "size": 3308,
+        "hash": "ffb14b46b096a39ab611777f30d85879",
+        "errors": false
+    },
+    "\/components\/points\/admin\/screens\/hooks-no-js-load.php": {
+        "size": 3302,
+        "hash": "ca1ebf1d9bdbab057d36ae91bfe3f980",
         "errors": false
     },
     "\/components\/points\/admin\/screens\/hooks-no-js.php": {
@@ -79,134 +99,29 @@
         "hash": "11a06a64286b667f82708cccea4e72cd",
         "errors": false
     },
+    "\/components\/points\/includes\/class-un-installer.php": {
+        "size": 22349,
+        "hash": "cdd240190dae32ec7a82f5de20bec947",
+        "errors": false
+    },
     "\/components\/points\/includes\/class-wordpoints-points-hook.php": {
         "size": 21968,
         "hash": "f73011b5d623c7a10e979dcc86f9f672",
         "errors": false
     },
     "\/components\/points\/includes\/class-wordpoints-points-hooks.php": {
-        "size": 24489,
-        "hash": "efd605b2fc001a6b7d153591544ab80e",
+        "size": 24528,
+        "hash": "cae6fd995aaa29ef52cbf5a8b9c12694",
         "errors": false
     },
     "\/components\/points\/includes\/class-wordpoints-points-logs-query.php": {
         "size": 31412,
-        "hash": "db6bee3b812b8b6c2473efc34d64f783",
-        "errors": false
-    },
-    "\/components\/points\/includes\/functions.php": {
-        "size": 8299,
-        "hash": "302e437518df025e29d317285cf6354d",
-        "errors": false
-    },
-    "\/components\/points\/includes\/hooks.php": {
-        "size": 1042,
-        "hash": "59d283d8b74b37a375bb87ffda70642e",
-        "errors": false
-    },
-    "\/components\/points\/includes\/index.php": {
-        "size": 28,
-        "hash": "f2dd0b74d953dcd2f078efd9dbe74330",
-        "errors": false
-    },
-    "\/components\/points\/includes\/logs.php": {
-        "size": 21321,
-        "hash": "34895e5b190f88a7e78d72c87ec61639",
-        "errors": false
-    },
-    "\/components\/points\/includes\/shortcodes.php": {
-        "size": 8393,
-        "hash": "b8b0a2349f9e4ef86c7dcf3da65a3a74",
-        "errors": false
-    },
-    "\/components\/points\/includes\/widgets.php": {
-        "size": 16582,
-        "hash": "79e3dd77e6df2f7690531c23b7648bbd",
-        "errors": false
-    },
-    "\/components\/points\/index.php": {
-        "size": 22,
-        "hash": "fc4cdc7613c06325a1358fbb1820097c",
-        "errors": false
-    },
-    "\/components\/points\/install.php": {
-        "size": 394,
-        "hash": "4af2a50bfe0d790977ea8cc7181b273a",
-        "errors": false
-    },
-    "\/components\/points\/points.php": {
-        "size": 3015,
-        "hash": "938923abe55f0d9b42ad2c15b2765ce4",
-        "errors": false
-    },
-    "\/components\/points\/uninstall.php": {
-        "size": 147,
-        "hash": "56552a47dceb1ea6529ba0163d73d67d",
-        "errors": false
-    },
-    "\/includes\/class-wordpoints-components.php": {
-        "size": 14682,
-        "hash": "bebd58d482994b6361c30c44b0d4b417",
-        "errors": false
-    },
-    "\/includes\/deprecated.php": {
-        "size": 11243,
-        "hash": "d596efc6bd6d554fdf369db66b59d870",
-        "errors": false
-    },
-    "\/includes\/functions.php": {
-        "size": 22141,
-        "hash": "7a312d4261121eb536a96b5279c8b3b3",
-        "errors": false
-    },
-    "\/includes\/index.php": {
-        "size": 26,
-        "hash": "e93b6d5dfa6f6f47bd719928d65d85c5",
-        "errors": false
-    },
-    "\/includes\/modules.php": {
-        "size": 33664,
-        "hash": "a78a087a7194253be092b7b8aaca57a8",
-        "errors": false
-    },
-    "\/includes\/scripts.php": {
-        "size": 1403,
-        "hash": "7ac6252eacd03211fc7dbb910e888f29",
-        "errors": false
-    },
-    "\/index.php": {
-        "size": 33,
-        "hash": "9f94aa1d201d265aaade64c225a656b1",
-        "errors": false
-    },
-    "\/install.php": {
-        "size": 243,
-        "hash": "763323680611d8d99eb982e62075beb4",
-        "errors": false
-    },
-    "\/uninstall.php": {
-        "size": 498,
-        "hash": "35915582c6a9f8d93298324711d4327e",
-        "errors": false
-    },
-    "\/wordpoints.php": {
-        "size": 5159,
-        "hash": "f30f4f63391d548f0394571274e09381",
-        "errors": false
-    },
-    "\/components\/points\/admin\/includes\/ajax.php": {
-        "size": 6921,
-        "hash": "0f024f3ad1aa67b6481ef91b2186896a",
-        "errors": false
-    },
-    "\/components\/points\/admin\/screens\/hooks-load.php": {
-        "size": 3308,
-        "hash": "ffb14b46b096a39ab611777f30d85879",
+        "hash": "c089e5a5d9cfcf24d04795a22a751e94",
         "errors": false
     },
-    "\/components\/points\/admin\/screens\/hooks-no-js-load.php": {
-        "size": 3302,
-        "hash": "ca1ebf1d9bdbab057d36ae91bfe3f980",
+    "\/components\/points\/includes\/constants.php": {
+        "size": 308,
+        "hash": "89f0fd2a543a04443cb6d11442c69dda",
         "errors": false
     },
     "\/components\/points\/includes\/deprecated.php": {
@@ -214,24 +129,29 @@
         "hash": "60cf40bff1741f84fa2535c72b797a3f",
         "errors": false
     },
-    "\/includes\/constants.php": {
-        "size": 647,
-        "hash": "331c2362e63a618ee91c1b6971ba5010",
+    "\/components\/points\/includes\/functions.php": {
+        "size": 8525,
+        "hash": "cc2cd6c3a4293152fd8ce594421f4fc9",
         "errors": false
     },
-    "\/components\/points\/includes\/update.php": {
-        "size": 11881,
-        "hash": "1753c05d31aaaad858db2819ad4dba9b",
+    "\/components\/points\/includes\/hooks\/abstracts\/comment-approved.php": {
+        "size": 9420,
+        "hash": "1a681d23c1387be3940507054739e59c",
         "errors": false
     },
-    "\/includes\/update.php": {
-        "size": 769,
-        "hash": "507b3392245feee8425e0d8d6fae6c20",
+    "\/components\/points\/includes\/hooks\/abstracts\/post-type.php": {
+        "size": 10558,
+        "hash": "0c85c54291269424b3f8195b99df6067",
+        "errors": false
+    },
+    "\/components\/points\/includes\/hooks\/comment-received.php": {
+        "size": 2335,
+        "hash": "810a243313f4eff732ee5d91bffc5909",
         "errors": false
     },
     "\/components\/points\/includes\/hooks\/comment-removed.php": {
-        "size": 4967,
-        "hash": "c73ab375085815e859fbee0b61933952",
+        "size": 4966,
+        "hash": "5e0482b3f5b2f1b704b99a005b2a7c4d",
         "errors": false
     },
     "\/components\/points\/includes\/hooks\/comment.php": {
@@ -240,48 +160,63 @@
         "errors": false
     },
     "\/components\/points\/includes\/hooks\/periodic.php": {
-        "size": 6852,
-        "hash": "ca1aeee2b499d1374987f7bf729a3c99",
+        "size": 6860,
+        "hash": "a1b98f63b3813e90aeec4297e9574b81",
         "errors": false
     },
     "\/components\/points\/includes\/hooks\/post-delete.php": {
-        "size": 3363,
-        "hash": "a9f5a6cf67ca4c88f255d45ecde3675b",
+        "size": 3362,
+        "hash": "d8eb4c9c8965e154722ed7248bb8e51f",
         "errors": false
     },
     "\/components\/points\/includes\/hooks\/post.php": {
-        "size": 7575,
-        "hash": "ae00a3576cdcb2f8acb411c40a183c99",
+        "size": 7574,
+        "hash": "46de3a7811f7973b08a724c37211b56a",
         "errors": false
     },
     "\/components\/points\/includes\/hooks\/registration.php": {
-        "size": 1892,
-        "hash": "59b66597353ee9a182a01b8593b42147",
+        "size": 1891,
+        "hash": "804f2f513ff3a0570d3dcbec8dccba73",
         "errors": false
     },
-    "\/admin\/screens\/configure-settings-load.php": {
-        "size": 1100,
-        "hash": "cc791be8c2d13d6daad4c8d8406ea79e",
+    "\/components\/points\/includes\/hooks.php": {
+        "size": 1042,
+        "hash": "59d283d8b74b37a375bb87ffda70642e",
         "errors": false
     },
-    "\/components\/points\/includes\/hooks\/abstracts\/post-type.php": {
-        "size": 10611,
-        "hash": "22beb19a27b421301dc2e94c854cd740",
+    "\/components\/points\/includes\/logs.php": {
+        "size": 21135,
+        "hash": "5d660e1ff5317c8d0e04e8201054926e",
         "errors": false
     },
-    "\/admin\/includes\/deprecated.php": {
-        "size": 339,
-        "hash": "8eb0461e028c2bcad1e9281aa4d9df53",
+    "\/components\/points\/includes\/points.php": {
+        "size": 35597,
+        "hash": "7418f20be13c1232022e1ab1fff1eb64",
         "errors": false
     },
-    "\/components\/points\/includes\/constants.php": {
-        "size": 308,
-        "hash": "89f0fd2a543a04443cb6d11442c69dda",
+    "\/components\/points\/includes\/shortcodes.php": {
+        "size": 8393,
+        "hash": "b8b0a2349f9e4ef86c7dcf3da65a3a74",
         "errors": false
     },
-    "\/components\/points\/includes\/points.php": {
-        "size": 35652,
-        "hash": "044fdacb4dd7f8acb30cd861fec253f9",
+    "\/components\/points\/includes\/widgets.php": {
+        "size": 16598,
+        "hash": "f32f0508ba75b923ea3f7824c2507a42",
+        "errors": false
+    },
+    "\/components\/points\/install.php": {
+        "size": 394,
+        "hash": "4af2a50bfe0d790977ea8cc7181b273a",
+        "errors": false
+    },
+    "\/components\/points\/points.php": {
+        "size": 3015,
+        "hash": "938923abe55f0d9b42ad2c15b2765ce4",
+        "errors": false
+    },
+    "\/components\/points\/uninstall.php": {
+        "size": 147,
+        "hash": "56552a47dceb1ea6529ba0163d73d67d",
         "errors": false
     },
     "\/components\/ranks\/admin\/admin.php": {
@@ -299,19 +234,24 @@
         "hash": "25ab447d4809235c805a8ab37e4d9347",
         "errors": false
     },
+    "\/components\/ranks\/includes\/class-un-installer.php": {
+        "size": 2482,
+        "hash": "4dbe09f394361165f9ac44e0ebf56b7c",
+        "errors": false
+    },
     "\/components\/ranks\/includes\/class-wordpoints-rank-group.php": {
         "size": 10892,
         "hash": "cb05a4d06d7184ec97b09dbc76300f1b",
         "errors": false
     },
     "\/components\/ranks\/includes\/class-wordpoints-rank-groups.php": {
-        "size": 4355,
-        "hash": "fe2cf46188e3b792aaf07bacef5e8272",
+        "size": 4305,
+        "hash": "71a66264f07a54735624248feb319140",
         "errors": false
     },
     "\/components\/ranks\/includes\/class-wordpoints-rank-type.php": {
-        "size": 8631,
-        "hash": "3f1e8c218c3ea0cceeada3e93b8e7834",
+        "size": 9016,
+        "hash": "d36a10fdca8c83ddb26f6c4dcb611dda",
         "errors": false
     },
     "\/components\/ranks\/includes\/class-wordpoints-rank-types.php": {
@@ -329,6 +269,11 @@
         "hash": "46189156c9713b8da0020140d0800231",
         "errors": false
     },
+    "\/components\/ranks\/includes\/deprecated.php": {
+        "size": 666,
+        "hash": "16945f69526feb24e66f314b1f9173bf",
+        "errors": false
+    },
     "\/components\/ranks\/includes\/functions.php": {
         "size": 1314,
         "hash": "42cdbcf83d635860bbc332196ed589dc",
@@ -359,9 +304,9 @@
         "hash": "6583c78c26b1e1e84a2ea9d40efadaf4",
         "errors": false
     },
-    "\/components\/ranks\/index.php": {
-        "size": 20,
-        "hash": "934b3e85adf4c88780aeefcee899aa1b",
+    "\/components\/ranks\/includes\/shortcodes.php": {
+        "size": 1236,
+        "hash": "f0298e91f9f3627209e061b00e6aafdf",
         "errors": false
     },
     "\/components\/ranks\/install.php": {
@@ -379,14 +324,14 @@
         "hash": "b327d9c19b5b1c7dfb1a6f8b10c54d53",
         "errors": false
     },
-    "\/includes\/uninstall-bootstrap.php": {
-        "size": 365,
-        "hash": "eb1d53accfa1baaddc0dcfcf60ed3065",
+    "\/includes\/class-shortcode.php": {
+        "size": 8132,
+        "hash": "f1fc7c7b8d5bc55919f1ff7fb713c758",
         "errors": false
     },
     "\/includes\/class-un-installer-base.php": {
-        "size": 11882,
-        "hash": "2b976c8776b48f24d4223758ff05c54f",
+        "size": 11881,
+        "hash": "e53cb50fe6b81e87b645d50fd89487ee",
         "errors": false
     },
     "\/includes\/class-un-installer.php": {
@@ -394,44 +339,64 @@
         "hash": "fc1cc532de7dfd5b86cc1c86c572047d",
         "errors": false
     },
-    "\/components\/points\/includes\/class-un-installer.php": {
-        "size": 21098,
-        "hash": "4893721f4fbd66f2759db0a835a96d54",
+    "\/includes\/class-widget.php": {
+        "size": 4256,
+        "hash": "e1f4cca75c3f285efde108e98fc859cc",
         "errors": false
     },
-    "\/components\/ranks\/includes\/class-un-installer.php": {
-        "size": 2482,
-        "hash": "4dbe09f394361165f9ac44e0ebf56b7c",
+    "\/includes\/class-wordpoints-components.php": {
+        "size": 15054,
+        "hash": "cae5aa64a9076a575e3090a620770155",
         "errors": false
     },
-    "\/components\/ranks\/includes\/deprecated.php": {
-        "size": 666,
-        "hash": "16945f69526feb24e66f314b1f9173bf",
+    "\/includes\/constants.php": {
+        "size": 640,
+        "hash": "ab580fd600021b52e7ebde17995ab736",
         "errors": false
     },
-    "\/components\/points\/includes\/hooks\/abstracts\/comment-approved.php": {
-        "size": 9420,
-        "hash": "1a681d23c1387be3940507054739e59c",
+    "\/includes\/deprecated.php": {
+        "size": 11243,
+        "hash": "d596efc6bd6d554fdf369db66b59d870",
         "errors": false
     },
-    "\/components\/points\/includes\/hooks\/comment-received.php": {
-        "size": 2335,
-        "hash": "810a243313f4eff732ee5d91bffc5909",
+    "\/includes\/functions.php": {
+        "size": 23666,
+        "hash": "60d678bd86014057f890f741af5ed395",
         "errors": false
     },
-    "\/components\/ranks\/includes\/shortcodes.php": {
-        "size": 1236,
-        "hash": "f0298e91f9f3627209e061b00e6aafdf",
+    "\/includes\/modules.php": {
+        "size": 33969,
+        "hash": "67b9531d5cbcb4eba41ecb54329c8461",
         "errors": false
     },
-    "\/includes\/class-shortcode.php": {
-        "size": 8132,
-        "hash": "f1fc7c7b8d5bc55919f1ff7fb713c758",
+    "\/includes\/scripts.php": {
+        "size": 1403,
+        "hash": "7ac6252eacd03211fc7dbb910e888f29",
         "errors": false
     },
-    "\/includes\/class-widget.php": {
-        "size": 4256,
-        "hash": "e1f4cca75c3f285efde108e98fc859cc",
+    "\/includes\/uninstall-bootstrap.php": {
+        "size": 365,
+        "hash": "eb1d53accfa1baaddc0dcfcf60ed3065",
+        "errors": false
+    },
+    "\/includes\/update.php": {
+        "size": 769,
+        "hash": "507b3392245feee8425e0d8d6fae6c20",
+        "errors": false
+    },
+    "\/install.php": {
+        "size": 243,
+        "hash": "763323680611d8d99eb982e62075beb4",
+        "errors": false
+    },
+    "\/uninstall.php": {
+        "size": 498,
+        "hash": "35915582c6a9f8d93298324711d4327e",
+        "errors": false
+    },
+    "\/wordpoints.php": {
+        "size": 5145,
+        "hash": "604f66584697dba68e0c6fbd25d2294f",
         "errors": false
     }
 }
\ No newline at end of file
diff --git a/tools/wp-l10n-validator/ignores-cache.json b/tools/wp-l10n-validator/ignores-cache.json
index 2d4e2097..b4197319 100644
--- a/tools/wp-l10n-validator/ignores-cache.json
+++ b/tools/wp-l10n-validator/ignores-cache.json
@@ -1,13 +1,24 @@
 {
     "\/components\/points\/includes\/class-un-installer.php": {
         "network": {
-            "494": false
+            "495": false,
+            "724": false
         },
         "standard": {
-            "497": false
+            "498": false,
+            "727": false
         },
         "post": {
-            "733": false
+            "734": false
+        },
+        "EXISTS": {
+            "841": {
+                "name": "array",
+                "type": "unknown",
+                "args_started": true,
+                "arg_count": 1,
+                "parentheses": 1
+            }
         }
     },
     "\/components\/points\/install.php": {
@@ -59,7 +70,7 @@
     },
     "\/admin\/admin.php": {
         "upload": {
-            "409": {
+            "421": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -73,42 +84,50 @@
             "22": false
         }
     },
-    "upload": {
-        "409": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 3,
-            "parentheses": 1
-        }
-    },
-    "network": {
-        "482": false,
-        "490": false,
-        "387": false,
-        "459": false,
-        "518": false,
-        "553": false,
-        "723": false,
-        "394": false,
-        "466": false,
-        "525": false,
-        "560": false
-    },
-    "standard": {
-        "484": false,
-        "493": false,
-        "389": false,
-        "461": false,
-        "520": false,
-        "555": false,
-        "726": false,
-        "396": false,
-        "468": false,
-        "527": false,
-        "562": false
-    },
     "\/admin\/includes\/class-wordpoints-modules-list-table.php": {
+        "all": {
+            "57": false,
+            "216": false
+        },
+        "active": {
+            "59": {
+                "name": "array",
+                "type": "unknown",
+                "args_started": true,
+                "arg_count": 0,
+                "parentheses": 1
+            },
+            "514": false
+        },
+        "inactive": {
+            "59": {
+                "name": "array",
+                "type": "unknown",
+                "args_started": true,
+                "arg_count": 1,
+                "parentheses": 1
+            },
+            "514": false
+        },
+        "search": {
+            "59": {
+                "name": "array",
+                "type": "unknown",
+                "args_started": true,
+                "arg_count": 3,
+                "parentheses": 1
+            },
+            "187": false
+        },
+        "plugins": {
+            "91": {
+                "name": "array",
+                "type": "unknown",
+                "args_started": true,
+                "arg_count": 2,
+                "parentheses": 1
+            }
+        },
         "second module-version-author-uri\">": {
             "574": false
         },
@@ -118,10 +137,10 @@
     },
     "\/admin\/screens\/configure-components.php": {
         "deactivate": {
-            "109": false
+            "102": false
         },
         "activate": {
-            "114": false
+            "107": false
         }
     },
     "\/admin\/screens\/modules-load.php": {
@@ -129,13 +148,13 @@
             "13": false
         },
         "1": {
-            "380": false
+            "394": false
         },
         "delete-selected": {
-            "380": false
+            "394": false
         },
         "compatibility-problems": {
-            "453": {
+            "463": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -165,16 +184,16 @@
     },
     "\/components\/points\/includes\/class-wordpoints-points-hook.php": {
         "network": {
-            "370": false,
-            "442": false,
-            "501": false,
-            "536": false
+            "394": false,
+            "466": false,
+            "525": false,
+            "560": false
         },
         "standard": {
-            "372": false,
-            "444": false,
-            "503": false,
-            "538": false
+            "396": false,
+            "468": false,
+            "527": false,
+            "562": false
         }
     },
     "\/components\/points\/includes\/class-wordpoints-points-hooks.php": {
@@ -200,10 +219,10 @@
             "434": false
         },
         ":": {
-            "594": false
+            "596": false
         },
         "points-": {
-            "669": {
+            "673": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -212,7 +231,7 @@
             }
         },
         "-save": {
-            "669": {
+            "673": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -221,10 +240,10 @@
             }
         },
         "\" class=\"hook": {
-            "742": false
+            "746": false
         },
         "-savehook": {
-            "775": {
+            "779": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -235,7 +254,6 @@
     },
     "\/components\/points\/includes\/hooks\/abstracts\/comment-approved.php": {
         "approved": {
-            "152": false,
             "159": false
         },
         "new": {
@@ -244,7 +262,7 @@
     },
     "\/components\/points\/includes\/logs.php": {
         "points": {
-            "256": {
+            "255": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -253,7 +271,7 @@
             }
         },
         "text": {
-            "256": {
+            "255": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -262,7 +280,7 @@
             }
         },
         "date": {
-            "256": {
+            "255": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -284,7 +302,7 @@
     },
     "\/components\/points\/includes\/shortcodes.php": {
         "default": {
-            "154": {
+            "159": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -303,26 +321,20 @@
                 "parentheses": 1
             }
         },
+        ": %points%": {
+            "158": false
+        },
         "1": {
             "425": false,
             "550": false
         }
     },
     "\/includes\/functions.php": {
-        "get": {
-            "135": {
-                "name": "wordpoints_verify_nonce",
-                "type": "unknown",
-                "args_started": true,
-                "arg_count": 3,
-                "parentheses": 1
-            }
-        },
         "-1": {
-            "467": false
+            "518": false
         },
         "points": {
-            "761": {
+            "814": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -331,7 +343,7 @@
             }
         },
         "ranks": {
-            "786": {
+            "839": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -340,71 +352,6 @@
             }
         }
     },
-    "0": {
-        "388": false
-    },
-    "delete-selected": {
-        "388": false,
-        "394": false
-    },
-    "compatibility-problems": {
-        "457": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 0,
-            "parentheses": 1
-        },
-        "463": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 0,
-            "parentheses": 1
-        }
-    },
-    "points-": {
-        "671": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 0,
-            "parentheses": 1
-        }
-    },
-    "-save": {
-        "671": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 0,
-            "parentheses": 1
-        }
-    },
-    "\" class=\"hook": {
-        "744": false
-    },
-    "-savehook": {
-        "777": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 0,
-            "parentheses": 1
-        }
-    },
-    "default": {
-        "159": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 1,
-            "parentheses": 1
-        }
-    },
-    ": %points%": {
-        "158": false
-    },
     "\/admin\/screens\/modules.php": {
         "module": {
             "34": {
@@ -457,7 +404,7 @@
     },
     "\/components\/points\/includes\/hooks\/comment-removed.php": {
         "approved": {
-            "133": false
+            "136": false
         }
     },
     "\/components\/ranks\/admin\/includes\/ajax.php": {
@@ -473,7 +420,7 @@
     },
     "\/includes\/modules.php": {
         "Module Name": {
-            "391": {
+            "392": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -482,7 +429,7 @@
             }
         },
         "Module URI": {
-            "392": {
+            "393": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -491,7 +438,7 @@
             }
         },
         "Version": {
-            "393": {
+            "394": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -500,7 +447,7 @@
             }
         },
         "Description": {
-            "394": {
+            "395": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -509,7 +456,7 @@
             }
         },
         "Author": {
-            "395": {
+            "396": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -518,7 +465,7 @@
             }
         },
         "Author URI": {
-            "396": {
+            "397": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -527,7 +474,7 @@
             }
         },
         "Text Domain": {
-            "397": {
+            "398": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -536,7 +483,7 @@
             }
         },
         "Domain Path": {
-            "398": {
+            "399": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -545,7 +492,7 @@
             }
         },
         "Network": {
-            "399": {
+            "400": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -554,7 +501,7 @@
             }
         },
         "Update API": {
-            "400": {
+            "401": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -562,8 +509,8 @@
                 "parentheses": 1
             }
         },
-        "ID": {
-            "401": {
+        "Channel": {
+            "402": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -571,51 +518,17 @@
                 "parentheses": 1
             }
         },
-        "true": {
-            "406": false
-        }
-    },
-    "second module-version-author-uri\">": {
-        "552": false
-    },
-    "column-": {
-        "601": false
-    },
-    "1": {
-        "394": false
-    },
-    "module": {
-        "36": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 0,
-            "parentheses": 1
-        }
-    },
-    "points": {
-        "775": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 0,
-            "parentheses": 1
+        "ID": {
+            "403": {
+                "name": "array",
+                "type": "unknown",
+                "args_started": true,
+                "arg_count": 11,
+                "parentheses": 1
+            }
         },
-        "255": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 2,
-            "parentheses": 1
-        }
-    },
-    "ranks": {
-        "800": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 0,
-            "parentheses": 1
+        "true": {
+            "412": false
         }
     },
     "\/components\/points\/includes\/hooks\/periodic.php": {
@@ -629,7 +542,7 @@
             }
         },
         "widefat wordpoints-append-to-hook-title": {
-            "228": {
+            "231": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -640,40 +553,21 @@
     },
     "\/components\/ranks\/includes\/class-wordpoints-rank-type.php": {
         "value=\"<% if ( typeof": {
-            "212": false
+            "220": false
         },
         "!== \"undefined\" ) { print(": {
-            "212": false
+            "220": false
         },
         "); } %>\"": {
-            "212": false
+            "220": false
         },
         "value=\"": {
-            "214": false
+            "222": false
         },
         "class=\"widefat\"\n\t\t\t\t\t\/>": {
-            "216": false
-        }
-    },
-    "text": {
-        "255": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 5,
-            "parentheses": 1
+            "224": false
         }
     },
-    "date": {
-        "255": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 6,
-            "parentheses": 1
-        },
-        "617": false
-    },
     "\/components\/points\/includes\/class-wordpoints-points-logs-query.php": {
         "text": {
             "41": {
@@ -708,7 +602,7 @@
                 "arg_count": 3,
                 "parentheses": 1
             },
-            "601": false
+            "617": false
         },
         "all": {
             "238": {
@@ -736,7 +630,7 @@
             }
         },
         "results": {
-            "375": {
+            "391": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -745,7 +639,7 @@
             }
         },
         "row": {
-            "375": {
+            "391": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -754,7 +648,7 @@
             }
         },
         "col": {
-            "375": {
+            "391": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -763,7 +657,7 @@
             }
         },
         "var": {
-            "375": {
+            "391": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -775,7 +669,7 @@
             "645": false
         },
         "<": {
-            "879": {
+            "895": {
                 "name": "array",
                 "type": "unknown",
                 "args_started": true,
@@ -784,130 +678,18 @@
             }
         },
         ",": {
-            "1001": false
+            "1017": false
         },
         "CAST(": {
             "1034": false
         },
         ".meta_value AS": {
-            "1034": false
+            "1050": false
         },
         "ORDER BY": {
             "1047": false
         }
     },
-    "results": {
-        "391": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 0,
-            "parentheses": 1
-        }
-    },
-    "row": {
-        "391": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 1,
-            "parentheses": 1
-        }
-    },
-    "col": {
-        "391": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 2,
-            "parentheses": 1
-        }
-    },
-    "var": {
-        "391": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 3,
-            "parentheses": 1
-        }
-    },
-    "FROM `": {
-        "661": false
-    },
-    "<": {
-        "895": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 1,
-            "parentheses": 1
-        }
-    },
-    "LIKE": {
-        "909": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 3,
-            "parentheses": 1
-        }
-    },
-    ",": {
-        "1017": false
-    },
-    "CAST(": {
-        "1050": false
-    },
-    ".meta_value AS": {
-        "1050": false
-    },
-    "ORDER BY": {
-        "1063": false
-    },
-    "all": {
-        "57": false,
-        "216": false
-    },
-    "active": {
-        "59": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 0,
-            "parentheses": 1
-        },
-        "514": false
-    },
-    "inactive": {
-        "59": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 1,
-            "parentheses": 1
-        },
-        "514": false
-    },
-    "search": {
-        "59": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 3,
-            "parentheses": 1
-        },
-        "187": false
-    },
-    "plugins": {
-        "91": {
-            "name": "array",
-            "type": "unknown",
-            "args_started": true,
-            "arg_count": 2,
-            "parentheses": 1
-        }
-    },
     "\/components\/ranks\/admin\/screens\/ranks.php": {
         "name": {
             "30": {
@@ -951,13 +733,6 @@
             }
         },
         "points": {
-            "102": {
-                "name": "array",
-                "type": "unknown",
-                "args_started": true,
-                "arg_count": 0,
-                "parentheses": 1
-            },
             "123": {
                 "name": "array",
                 "type": "unknown",
@@ -978,15 +753,6 @@
             }
         }
     },
-    "approved": {
-        "167": false,
-        "174": false,
-        "136": false,
-        "159": false
-    },
-    "new": {
-        "168": false
-    },
     "\/components\/points\/includes\/hooks\/abstracts\/post-type.php": {
         "see bug #23268 (fixed in 3.9)": {
             "120": {
@@ -998,10 +764,10 @@
             }
         },
         "\" type=\"checkbox\" value=\"1\"": {
-            "324": false
+            "323": false
         },
         "1": {
-            "324": {
+            "323": {
                 "name": "checked",
                 "type": "unknown",
                 "args_started": true,
@@ -1009,5 +775,41 @@
                 "parentheses": 1
             }
         }
+    },
+    "\/admin\/includes\/class-wordpoints-module-installer-skin.php": {
+        "upload": {
+            "56": {
+                "name": "array",
+                "type": "unknown",
+                "args_started": true,
+                "arg_count": 0,
+                "parentheses": 1
+            }
+        }
+    },
+    "\/admin\/screens\/module-install.php": {
+        "upload": {
+            "13": false
+        }
+    },
+    "\/components\/ranks\/admin\/admin.php": {
+        "adding-editing": {
+            "116": {
+                "name": "array",
+                "type": "unknown",
+                "args_started": true,
+                "arg_count": 0,
+                "parentheses": 1
+            }
+        },
+        "deleting": {
+            "127": {
+                "name": "array",
+                "type": "unknown",
+                "args_started": true,
+                "arg_count": 0,
+                "parentheses": 1
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/wp-l10n-validator.json b/wp-l10n-validator.json
index 6f36fc93..fbc44e40 100644
--- a/wp-l10n-validator.json
+++ b/wp-l10n-validator.json
@@ -1,7 +1,7 @@
 {
 	"textdomain": { "wordpoints": true, "default": true },
 	"basedir": "./src",
-	"bootstrap": "vendor/wordpoints/l10n-validator-config/bootstrap.php",
+	"bootstrap": "dev-lib-wordpoints/l10n-validator/bootstrap.php",
 	"cache": "./tools/wp-l10n-validator/cache.json",
 	"ignores-cache": "./tools/wp-l10n-validator/ignores-cache.json",
 	"ignores-tolerance": 25,