Merge branch 'release/141009'

.floo

@@ -0,0 +1,3 @@
+{
+    "url": "https://floobits.com/jaswsinc/wp-redirects"
+}

.flooignore

@@ -0,0 +1,6 @@
+extern
+node_modules
+tmp
+vendor
+.idea/workspace.xml
+.idea/misc.xml

README.md

@@ -1,3 +1,7 @@
 ## WordPress® Redirects
 
 Redirects (a new Post Type) for WordPress®.
+
+---
+
+This project is now on Floobits too! [Watch us code](https://floobits.com/jaswsinc/wp-redirects/redirect) in real-time :-) <a href="https://floobits.com/jaswsinc/wp-redirects/redirect"><img alt="Floobits status" width="100" height="40" src="https://floobits.com/jaswsinc/wp-redirects.png" align="right" /></a>

wp-redirects/client-s/css/admin-style.css

@@ -0,0 +1,2 @@
+.column-hits { width: 75px; }
+.column-last_access { width: 150px; }

wp-redirects/includes/translations/wp-redirects.pot

@@ -2,133 +2,206 @@
 # This file is distributed under the same license as the WP Redirects package.
 msgid ""
 msgstr ""
-"Project-Id-Version: WP Redirects 131121\n"
+"Project-Id-Version: WP Redirects 141009\n"
 "Report-Msgid-Bugs-To: http://wordpress.org/tag/wp-redirects\n"
-"POT-Creation-Date: 2014-01-08 06:00:06+00:00\n"
+"POT-Creation-Date: 2014-10-09 19:19:10+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "PO-Revision-Date: 2014-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 
-#: wp-redirects.php:58
+#: includes/wp-php53.php:64
+msgid "<strong>%1$s is NOT active.</strong>"
+msgstr ""
+
+#: includes/wp-php53.php:65
+msgid "<strong>It requires PHP v%1$s+.</strong>"
+msgstr ""
+
+#: includes/wp-php53.php:66
+msgid "&#8627; You're currently running an older copy of PHP v%1$s."
+msgstr ""
+
+#: includes/wp-php53.php:67
+msgid "<em>A simple update is necessary. Please ask your hosting company to help resolve this quickly.</em>"
+msgstr ""
+
+#: includes/wp-php53.php:68
+msgid "<em>To remove this message, please upgrade. Or, remove %1$s from WordPress.</em>"
+msgstr ""
+
+#: wp-redirects.inc.php:107
 msgid "Redirects"
 msgstr ""
 
-#: wp-redirects.php:59
+#: wp-redirects.inc.php:108
 msgid "Redirect"
 msgstr ""
 
-#: wp-redirects.php:60
+#: wp-redirects.inc.php:109
 msgid "Add Redirect"
 msgstr ""
 
-#: wp-redirects.php:61
+#: wp-redirects.inc.php:110
 msgid "Add New Redirect"
 msgstr ""
 
-#: wp-redirects.php:62
+#: wp-redirects.inc.php:111
 msgid "Edit Redirect"
 msgstr ""
 
-#: wp-redirects.php:63
+#: wp-redirects.inc.php:112
 msgid "New Redirect"
 msgstr ""
 
-#: wp-redirects.php:64
+#: wp-redirects.inc.php:113
 msgid "All Redirects"
 msgstr ""
 
-#: wp-redirects.php:65
+#: wp-redirects.inc.php:114
 msgid "View Redirect"
 msgstr ""
 
-#: wp-redirects.php:66
+#: wp-redirects.inc.php:115
 msgid "Search Redirects"
 msgstr ""
 
-#: wp-redirects.php:67
+#: wp-redirects.inc.php:116
 msgid "No Redirects found"
 msgstr ""
 
-#: wp-redirects.php:68
+#: wp-redirects.inc.php:117
 msgid "No Redirects found in Trash"
 msgstr ""
 
-#: wp-redirects.php:227
-msgid "Redirect Configuration"
+#: wp-redirects.inc.php:334
+msgid "Never"
 msgstr ""
 
-#: wp-redirects.php:238
-msgid ""
-"This is optional. It defaults to a value of <code>301</code> for redirection."
+#: wp-redirects.inc.php:341
+msgid "Target URL"
 msgstr ""
 
-#: wp-redirects.php:242
-msgid "<strong>Redirection URL *</strong> (a full URL, absolutely required):"
+#: wp-redirects.inc.php:343
+msgid "Source URL"
 msgstr ""
 
-#: wp-redirects.php:244
+#: wp-redirects.inc.php:345
+msgid "Additional Source URIs"
+msgstr ""
+
+#: wp-redirects.inc.php:347
+msgid "HTTP Status Code"
+msgstr ""
+
+#: wp-redirects.inc.php:349
+msgid "Redirection Statistics"
+msgstr ""
+
+#: wp-redirects.inc.php:358
+msgid "The <strong>Target URL</strong> is the URL that your <strong>Source URL</strong> will be redirected to."
+msgstr ""
+
+#: wp-redirects.inc.php:359
+msgid "This is the only required field to create a Redirect with WP Redirects, as the Source URL (see below) is generated for you automatically."
+msgstr ""
+
+#: wp-redirects.inc.php:360
+msgid "<strong>Target URL</strong> (a full, absolute URI, e.g., <code>http://example.com/</code>):"
+msgstr ""
+
+#: wp-redirects.inc.php:362
 msgid "Yes, pass all <code>$_GET</code> query string variables to this URL."
 msgstr ""
 
-#: wp-redirects.php:244
-msgid ""
-"If checked, all `$_GET` query string variables will be passed to the "
-"Redirection URL (adding to any that already exist)."
+#: wp-redirects.inc.php:362
+msgid "If checked, all `$_GET` query string variables will be passed to the Redirection URL (adding to any that already exist)."
 msgstr ""
 
-#: wp-redirects.php:244
-msgid ""
-"It is also possible to use specific Replacement Codes in your Redirection "
-"URL, referencing `$_GET`, `$_POST`, `$_REQUEST`, `$_COOKIE`, or `$_SESSION` "
-"values."
+#: wp-redirects.inc.php:362
+msgid "It is also possible to use specific Replacement Codes in your Redirection URL, referencing `$_GET`, `$_POST`, `$_REQUEST`, `$_COOKIE`, or `$_SESSION` values."
 msgstr ""
 
-#: wp-redirects.php:244
+#: wp-redirects.inc.php:362
 msgid "Example Replacement Codes:"
 msgstr ""
 
-#: wp-redirects.php:244
-msgid ""
-"* If you\\'re using an advanced regular expression, there are Replacement "
-"Codes to reference parenthesized subpatterns."
+#: wp-redirects.inc.php:362
+msgid "* If you\\'re using an advanced regular expression, there are Replacement Codes to reference parenthesized subpatterns."
 msgstr ""
 
-#: wp-redirects.php:244
+#: wp-redirects.inc.php:362
 msgid "(string matching the full pattern)"
 msgstr ""
 
-#: wp-redirects.php:244
+#: wp-redirects.inc.php:362
 msgid "(1st parenthesized subpattern)"
 msgstr ""
 
-#: wp-redirects.php:244
+#: wp-redirects.inc.php:362
 msgid "(2nd parenthesized subpattern)"
 msgstr ""
 
-#: wp-redirects.php:248
-msgid "Additional Redirections From (optional pattern matching):"
+#: wp-redirects.inc.php:372
+msgid "The <strong>Source URL</strong> is the URL that gets redirected to your <strong>Target URL</strong>."
 msgstr ""
 
-#: wp-redirects.php:250
-msgid ""
-"This is optional. By default, redirection simply occurs <strong>from</"
-"strong> the Permalink for this Redirection."
+#: wp-redirects.inc.php:373
+msgid "WP Redirects automatically generates a unique Source URL for you by using the Permalink generated by WordPress for this Redirect. Once you've saved this Redirect and a Permalink has been generated, you can edit the Permalink (i.e., the Source URL) using the Edit button underneath the Title. Additional Source URIs can also be configured (optional, see Additional Source URIs below)."
 msgstr ""
 
-#: wp-redirects.php:251
-msgid ""
-"<strong>Redirecting from additional locations:</strong> This can be "
-"accomplished here with a pattern. By default, a pattern supplied here is "
-"caSe sensitive, using one exact comparison against <code>$_SERVER"
-"['REQUEST_URI']</code>. However, it is possible to precede your pattern "
-"with: <code>regex:</code> to enable advanced regular expression pattern "
-"matching. Example: <code>regex: /pattern/i</code>. It is also possible to "
-"use regex Replacement Codes in your Redirection URL above, referencing any "
-"parenthesized subpatterns. For example: <code>%%0%%</code>, <code>%%1%%</"
-"code>, <code>%%2%%</code>."
+#: wp-redirects.inc.php:383
+msgid "<strong>Source URL: </strong> <code>Please enter a title above and click Save Draft to generate the default Source URL</code>"
+msgstr ""
+
+#: wp-redirects.inc.php:394
+msgid "If you want to redirect additional Source URIs to the <strong>Target URL</strong>, you can enter a single URI below or use a Regular Expression to redirect all URIs that match a specific pattern."
+msgstr ""
+
+#: wp-redirects.inc.php:395
+msgid "<strong>An Additional Single Redirect URI or a Regular Expression Pattern:</strong>"
+msgstr ""
+
+#: wp-redirects.inc.php:398
+msgid "However, it is also possible to precede your pattern with: <code>regex:</code> to enable advanced regular expression pattern matching. Example: <code>regex: /pattern/i</code>. It is also possible to use regex Replacement Codes in your Redirection URL above, referencing any parenthesized subpatterns. For example: <code>%%0%%</code>, <code>%%1%%</code>, <code>%%2%%</code>."
+msgstr ""
+
+#: wp-redirects.inc.php:408
+msgid "By default, WP Redirects sends the standard <code>301</code> HTTP status code when doing a redirect. If you want to override that value, you can enter a custom HTTP Status Code below.<br /><br />"
+msgstr ""
+
+#: wp-redirects.inc.php:422
+msgid "<strong>Total Hits:</strong>"
+msgstr ""
+
+#: wp-redirects.inc.php:424
+msgid "<strong>Last Access:</strong>"
+msgstr ""
+
+#: wp-redirects.inc.php:429
+msgid "The hit count for this redirect has been reset. To save these changes, click Update."
+msgstr ""
+
+#: wp-redirects.inc.php:430
+msgid "The last access date for this redirect has been reset. To save these changes, click Update."
+msgstr ""
+
+#: wp-redirects.inc.php:497
+msgid "Hits"
+msgstr ""
+
+#: wp-redirects.inc.php:498
+msgid "Last Access"
+msgstr ""
+
+#: wp-redirects.inc.php:560
+msgid "<strong>WP Redirects:</strong> detected a new version of itself. Recompiling w/ latest version... all done :-)"
+msgstr ""
+
+#: wp-redirects.inc.php:629
+msgid "You appear to be running another instance of WP-Redirects. Please disable the other instance before enabling this one."
 msgstr ""
 
 #. Plugin Name of the plugin/theme
@@ -140,15 +213,13 @@ msgid "http://www.websharks-inc.com/product/wp-redirects/"
 msgstr ""
 
 #. Description of the plugin/theme
-msgid ""
-"Create Redirects! This plugin adds a new Post Type. Redirect from anywhere — "
-"to anywhere. A very lightweight plugin!"
+msgid "Create Redirects! This plugin adds a new Post Type. Redirect from anywhere — to anywhere. A very lightweight plugin!"
 msgstr ""
 
 #. Author of the plugin/theme
-msgid "WebSharks, Inc. (Jason Caldwell)"
+msgid "WebSharks, Inc."
 msgstr ""
 
 #. Author URI of the plugin/theme
-msgid "http://www.websharks-inc.com/"
+msgid "http://www.websharks-inc.com"
 msgstr ""