Release 3.6.3

johngodley · Nov 14, 2018 · 0e4f73e · 0e4f73e
1 parent 4336e64
commit 0e4f73e
Show file tree

Hide file tree

Showing 43 changed files with 290 additions and 361 deletions.
diff --git a/client/page/io/index.js b/client/page/io/index.js
@@ -21,7 +21,7 @@ import { STATUS_IN_PROGRESS, STATUS_COMPLETE } from 'state/settings/type';
 import Importer from './importer';
 import './style.scss';
 
-const getUrl = ( moduleId, modType ) => Redirectioni10n.pluginRoot + '&sub=io&export=' + moduleId + '&exporter=' + modType;
+const getUrl = ( moduleId, modType ) => Redirectioni10n.pluginRoot + '&sub=io&export=' + moduleId + '&exporter=' + modType + '&_wpnonce=' + Redirectioni10n.WP_API_nonce;
 
 class ImportExport extends React.Component {
 	constructor( props ) {

diff --git a/client/page/options/options-form.js b/client/page/options/options-form.js
@@ -37,9 +37,7 @@ const ipLogging = () => [
 export const restApi = () => [
 	{ value: 0, text: __( 'Default /wp-json/' ) },
 	{ value: 1, text: __( 'Raw /index.php?rest_route=/' ) },
-	{ value: 2, text: __( 'Proxy over Admin AJAX' ) },
 	{ value: 3, text: __( 'Relative /wp-json/' ) },
-	{ value: 4, text: __( 'Form request' ) },
 ];
 
 class OptionsForm extends React.Component {

diff --git a/locale/json/redirection-de_DE.json b/locale/json/redirection-de_DE.json
diff --git a/locale/json/redirection-en_CA.json b/locale/json/redirection-en_CA.json
diff --git a/locale/json/redirection-en_GB.json b/locale/json/redirection-en_GB.json
diff --git a/locale/json/redirection-es_ES.json b/locale/json/redirection-es_ES.json
diff --git a/locale/json/redirection-fr_FR.json b/locale/json/redirection-fr_FR.json
diff --git a/locale/json/redirection-it_IT.json b/locale/json/redirection-it_IT.json
diff --git a/locale/json/redirection-ja.json b/locale/json/redirection-ja.json
diff --git a/locale/json/redirection-lv.json b/locale/json/redirection-lv.json
diff --git a/locale/json/redirection-pt_BR.json b/locale/json/redirection-pt_BR.json
diff --git a/locale/json/redirection-ru_RU.json b/locale/json/redirection-ru_RU.json
diff --git a/locale/json/redirection-sv_SE.json b/locale/json/redirection-sv_SE.json
diff --git a/locale/redirection-de_DE.po b/locale/redirection-de_DE.po
@@ -11,6 +11,11 @@ msgstr ""
 "Language: de\n"
 "Project-Id-Version: Plugins - Redirection - Stable (latest release)\n"
 
+#. translators: 1: Site URL, 2: Home URL
+#: models/fixer.php:56
+msgid "Site and home URL are inconsistent. Please correct from your Settings > General page: %1$1s is not %2$2s"
+msgstr ""
+
 #: redirection-admin.php:389
 msgid "Unsupported PHP"
 msgstr ""
@@ -80,7 +85,7 @@ msgstr ""
 msgid "Delete all logs for these entries"
 msgstr ""
 
-#: redirection-strings.php:192
+#: redirection-strings.php:192 redirection-strings.php:205
 msgid "Delete all logs for this entry"
 msgstr ""
 
@@ -289,10 +294,6 @@ msgstr ""
 msgid "Site and home protocol"
 msgstr ""
 
-#: models/fixer.php:55
-msgid "Site and home URL are inconsistent - please correct from your General settings"
-msgstr ""
-
 #: models/fixer.php:53
 msgid "Site and home are consistent"
 msgstr ""
@@ -696,10 +697,6 @@ msgstr ""
 msgid "Delete 404s"
 msgstr ""
 
-#: redirection-strings.php:205
-msgid "Delete all logs for this 404"
-msgstr ""
-
 #: redirection-strings.php:156
 msgid "Delete all from IP %s"
 msgstr ""

diff --git a/locale/redirection-en_CA.mo b/locale/redirection-en_CA.mo
diff --git a/locale/redirection-en_CA.po b/locale/redirection-en_CA.po
@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the Plugins - Redirection - Stable (latest release) package.
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2018-11-07 06:13:56+0000\n"
+"PO-Revision-Date: 2018-11-13 17:33:58+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -11,6 +11,11 @@ msgstr ""
 "Language: en_CA\n"
 "Project-Id-Version: Plugins - Redirection - Stable (latest release)\n"
 
+#. translators: 1: Site URL, 2: Home URL
+#: models/fixer.php:56
+msgid "Site and home URL are inconsistent. Please correct from your Settings > General page: %1$1s is not %2$2s"
+msgstr "Site and home URL are inconsistent. Please correct from your Settings > General page: %1$1s is not %2$2s"
+
 #: redirection-admin.php:389
 msgid "Unsupported PHP"
 msgstr "Unsupported PHP"
@@ -80,7 +85,7 @@ msgstr "Show All"
 msgid "Delete all logs for these entries"
 msgstr "Delete all logs for these entries"
 
-#: redirection-strings.php:192
+#: redirection-strings.php:192 redirection-strings.php:205
 msgid "Delete all logs for this entry"
 msgstr "Delete all logs for this entry"
 
@@ -289,10 +294,6 @@ msgstr "If you are unable to get anything working then Redirection may have diff
 msgid "Site and home protocol"
 msgstr "Site and home protocol"
 
-#: models/fixer.php:55
-msgid "Site and home URL are inconsistent - please correct from your General settings"
-msgstr "Site and home URL are inconsistent - please correct from your General settings"
-
 #: models/fixer.php:53
 msgid "Site and home are consistent"
 msgstr "Site and home are consistent"
@@ -696,10 +697,6 @@ msgstr "URL Monitor"
 msgid "Delete 404s"
 msgstr "Delete 404s"
 
-#: redirection-strings.php:205
-msgid "Delete all logs for this 404"
-msgstr "Delete all logs for this 404"
-
 #: redirection-strings.php:156
 msgid "Delete all from IP %s"
 msgstr "Delete all from IP %s"

diff --git a/locale/redirection-en_GB.mo b/locale/redirection-en_GB.mo
diff --git a/locale/redirection-en_GB.po b/locale/redirection-en_GB.po
@@ -11,6 +11,11 @@ msgstr ""
 "Language: en_GB\n"
 "Project-Id-Version: Plugins - Redirection - Stable (latest release)\n"
 
+#. translators: 1: Site URL, 2: Home URL
+#: models/fixer.php:56
+msgid "Site and home URL are inconsistent. Please correct from your Settings > General page: %1$1s is not %2$2s"
+msgstr ""
+
 #: redirection-admin.php:389
 msgid "Unsupported PHP"
 msgstr ""
@@ -80,7 +85,7 @@ msgstr "Show All"
 msgid "Delete all logs for these entries"
 msgstr "Delete all logs for these entries"
 
-#: redirection-strings.php:192
+#: redirection-strings.php:192 redirection-strings.php:205
 msgid "Delete all logs for this entry"
 msgstr "Delete all logs for this entry"
 
@@ -289,10 +294,6 @@ msgstr "If you are unable to get anything working then Redirection may have diff
 msgid "Site and home protocol"
 msgstr "Site and home protocol"
 
-#: models/fixer.php:55
-msgid "Site and home URL are inconsistent - please correct from your General settings"
-msgstr "Site and home URL are inconsistent - please correct from your General settings"
-
 #: models/fixer.php:53
 msgid "Site and home are consistent"
 msgstr "Site and home are consistent"
@@ -696,10 +697,6 @@ msgstr "URL Monitor"
 msgid "Delete 404s"
 msgstr "Delete 404s"
 
-#: redirection-strings.php:205
-msgid "Delete all logs for this 404"
-msgstr "Delete all logs for this 404"
-
 #: redirection-strings.php:156
 msgid "Delete all from IP %s"
 msgstr "Delete all from IP %s"

diff --git a/locale/redirection-es_ES.mo b/locale/redirection-es_ES.mo
diff --git a/locale/redirection-es_ES.po b/locale/redirection-es_ES.po
@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the Plugins - Redirection - Stable (latest release) package.
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2018-11-05 08:49:31+0000\n"
+"PO-Revision-Date: 2018-11-10 18:26:49+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -11,6 +11,11 @@ msgstr ""
 "Language: es\n"
 "Project-Id-Version: Plugins - Redirection - Stable (latest release)\n"
 
+#. translators: 1: Site URL, 2: Home URL
+#: models/fixer.php:56
+msgid "Site and home URL are inconsistent. Please correct from your Settings > General page: %1$1s is not %2$2s"
+msgstr "La URL del sitio y de inicio no son consistentes. Por favor, corrígelo en tu página de Ajustes > Generales: %1$1s no es igual a %2$2s"
+
 #: redirection-admin.php:389
 msgid "Unsupported PHP"
 msgstr "PHP no compatible"
@@ -80,7 +85,7 @@ msgstr "Mostrar todo"
 msgid "Delete all logs for these entries"
 msgstr "Borrar todos los registros de estas entradas"
 
-#: redirection-strings.php:192
+#: redirection-strings.php:192 redirection-strings.php:205
 msgid "Delete all logs for this entry"
 msgstr "Borrar todos los registros de esta entrada"
 
@@ -289,10 +294,6 @@ msgstr "Si no puedes hacer que funcione nada entonces Redirection puede tener di
 msgid "Site and home protocol"
 msgstr "Protocolo de portada y el sitio"
 
-#: models/fixer.php:55
-msgid "Site and home URL are inconsistent - please correct from your General settings"
-msgstr "Las URLs del sitio y portada son inconsistentes - por favor, corrígelo en tus ajustes generales"
-
 #: models/fixer.php:53
 msgid "Site and home are consistent"
 msgstr "Portada y sitio son consistentes"
@@ -696,10 +697,6 @@ msgstr "Supervisar URL"
 msgid "Delete 404s"
 msgstr "Borrar 404s"
 
-#: redirection-strings.php:205
-msgid "Delete all logs for this 404"
-msgstr "Borra todos los registros de este 404"
-
 #: redirection-strings.php:156
 msgid "Delete all from IP %s"
 msgstr "Borra todo de la IP %s"

diff --git a/locale/redirection-fr_FR.mo b/locale/redirection-fr_FR.mo
diff --git a/locale/redirection-fr_FR.po b/locale/redirection-fr_FR.po
@@ -11,6 +11,11 @@ msgstr ""
 "Language: fr\n"
 "Project-Id-Version: Plugins - Redirection - Stable (latest release)\n"
 
+#. translators: 1: Site URL, 2: Home URL
+#: models/fixer.php:56
+msgid "Site and home URL are inconsistent. Please correct from your Settings > General page: %1$1s is not %2$2s"
+msgstr ""
+
 #: redirection-admin.php:389
 msgid "Unsupported PHP"
 msgstr "PHP non supporté"
@@ -80,7 +85,7 @@ msgstr "Tout afficher"
 msgid "Delete all logs for these entries"
 msgstr "Supprimer les journaux pour ces entrées"
 
-#: redirection-strings.php:192
+#: redirection-strings.php:192 redirection-strings.php:205
 msgid "Delete all logs for this entry"
 msgstr "Supprimer les journaux pour cet entrée"
 
@@ -289,10 +294,6 @@ msgstr "Si vous ne pouvez pas faire fonctionne quoi que ce soit alors l’extens
 msgid "Site and home protocol"
 msgstr "Protocole du site et de l’accueil"
 
-#: models/fixer.php:55
-msgid "Site and home URL are inconsistent - please correct from your General settings"
-msgstr "Les URL du site et de l’accueil sont incohérentes. Veuillez les corriger dans vos réglages généraux."
-
 #: models/fixer.php:53
 msgid "Site and home are consistent"
 msgstr "Le site et l’accueil sont cohérents"
@@ -696,10 +697,6 @@ msgstr "URL à surveiller"
 msgid "Delete 404s"
 msgstr "Supprimer les pages 404"
 
-#: redirection-strings.php:205
-msgid "Delete all logs for this 404"
-msgstr "Supprimer tous les journaux pour cette page 404"
-
 #: redirection-strings.php:156
 msgid "Delete all from IP %s"
 msgstr "Tout supprimer depuis l’IP %s"

diff --git a/locale/redirection-it_IT.po b/locale/redirection-it_IT.po
@@ -11,6 +11,11 @@ msgstr ""
 "Language: it\n"
 "Project-Id-Version: Plugins - Redirection - Stable (latest release)\n"
 
+#. translators: 1: Site URL, 2: Home URL
+#: models/fixer.php:56
+msgid "Site and home URL are inconsistent. Please correct from your Settings > General page: %1$1s is not %2$2s"
+msgstr ""
+
 #: redirection-admin.php:389
 msgid "Unsupported PHP"
 msgstr ""
@@ -80,7 +85,7 @@ msgstr ""
 msgid "Delete all logs for these entries"
 msgstr ""
 
-#: redirection-strings.php:192
+#: redirection-strings.php:192 redirection-strings.php:205
 msgid "Delete all logs for this entry"
 msgstr ""
 
@@ -289,10 +294,6 @@ msgstr ""
 msgid "Site and home protocol"
 msgstr ""
 
-#: models/fixer.php:55
-msgid "Site and home URL are inconsistent - please correct from your General settings"
-msgstr ""
-
 #: models/fixer.php:53
 msgid "Site and home are consistent"
 msgstr ""
@@ -696,10 +697,6 @@ msgstr ""
 msgid "Delete 404s"
 msgstr ""
 
-#: redirection-strings.php:205
-msgid "Delete all logs for this 404"
-msgstr ""
-
 #: redirection-strings.php:156
 msgid "Delete all from IP %s"
 msgstr ""

diff --git a/locale/redirection-ja.mo b/locale/redirection-ja.mo
diff --git a/locale/redirection-ja.po b/locale/redirection-ja.po
@@ -11,6 +11,11 @@ msgstr ""
 "Language: ja_JP\n"
 "Project-Id-Version: Plugins - Redirection - Stable (latest release)\n"
 
+#. translators: 1: Site URL, 2: Home URL
+#: models/fixer.php:56
+msgid "Site and home URL are inconsistent. Please correct from your Settings > General page: %1$1s is not %2$2s"
+msgstr ""
+
 #: redirection-admin.php:389
 msgid "Unsupported PHP"
 msgstr ""
@@ -80,7 +85,7 @@ msgstr ""
 msgid "Delete all logs for these entries"
 msgstr ""
 
-#: redirection-strings.php:192
+#: redirection-strings.php:192 redirection-strings.php:205
 msgid "Delete all logs for this entry"
 msgstr ""
 
@@ -289,10 +294,6 @@ msgstr "動作が正常にできていない場合、 Redirection がサーバ
 msgid "Site and home protocol"
 msgstr "サイト URL とホーム URL のプロトコル"
 
-#: models/fixer.php:55
-msgid "Site and home URL are inconsistent - please correct from your General settings"
-msgstr "サイト URL とホーム URL が一致しません。一般設定より設定してください。"
-
 #: models/fixer.php:53
 msgid "Site and home are consistent"
 msgstr "サイト URL とホーム URL は一致しています"
@@ -696,10 +697,6 @@ msgstr "URL モニター"
 msgid "Delete 404s"
 msgstr "404を削除"
 
-#: redirection-strings.php:205
-msgid "Delete all logs for this 404"
-msgstr "この404エラーに対するすべてのログを削除"
-
 #: redirection-strings.php:156
 msgid "Delete all from IP %s"
 msgstr "すべての IP %s からのものを削除"

diff --git a/locale/redirection-lv.mo b/locale/redirection-lv.mo
diff --git a/locale/redirection-lv.po b/locale/redirection-lv.po
@@ -11,6 +11,11 @@ msgstr ""
 "Language: lv\n"
 "Project-Id-Version: Plugins - Redirection - Stable (latest release)\n"
 
+#. translators: 1: Site URL, 2: Home URL
+#: models/fixer.php:56
+msgid "Site and home URL are inconsistent. Please correct from your Settings > General page: %1$1s is not %2$2s"
+msgstr ""
+
 #: redirection-admin.php:389
 msgid "Unsupported PHP"
 msgstr ""
@@ -80,7 +85,7 @@ msgstr ""
 msgid "Delete all logs for these entries"
 msgstr ""
 
-#: redirection-strings.php:192
+#: redirection-strings.php:192 redirection-strings.php:205
 msgid "Delete all logs for this entry"
 msgstr ""
 
@@ -289,10 +294,6 @@ msgstr ""
 msgid "Site and home protocol"
 msgstr ""
 
-#: models/fixer.php:55
-msgid "Site and home URL are inconsistent - please correct from your General settings"
-msgstr "Tīmekļa vietnes un Sākuma URL ir pretrunīgi - lūdzu veic labojumus Gavenajos Uzstādījumos"
-
 #: models/fixer.php:53
 msgid "Site and home are consistent"
 msgstr "Tīmekļa vietnes un sākumlapas URL ir saderīgi"
@@ -696,10 +697,6 @@ msgstr "URL Pārraudzība"
 msgid "Delete 404s"
 msgstr "Dzēst 404 kļūdas"
 
-#: redirection-strings.php:205
-msgid "Delete all logs for this 404"
-msgstr "Dzēst visus ierakstus par šo 404"
-
 #: redirection-strings.php:156
 msgid "Delete all from IP %s"
 msgstr "Dzēst visu par IP %s"

diff --git a/locale/redirection-pt_BR.mo b/locale/redirection-pt_BR.mo