Merge branch 'release-2.5.3' into releases

client/js/dev/lib.view.js

@@ -3021,7 +3021,7 @@ var Content_Item = {
 			ret = ( 'source' === mode ) ? this.get_attribute('permalink') : '';
 		}
 		// Format
-		ret = ret.replace('&', '&');
+		ret = ret.replace(/&(#38|amp);/, '&');
 		return ret;
 	},
 

controller.php

@@ -359,7 +359,7 @@ public function theme_page_callback_support() {
 	 * @return string Modified link text
 	 */
 	public function admin_plugin_row_meta_support($text) {
-		return "Feedback & Support";
+		return __("Feedback & Support", 'simple-lightbox');
 	}
 
 	/*-** Functionality **-*/
@@ -375,7 +375,7 @@ function is_enabled() {
 			if ( $ret ) {
 				$opt = '';
 				// Determine option to check
-				if ( is_home() ) {
+				if ( is_home() || is_front_page() ) {
 					$opt = 'home';
 				}
 				elseif ( is_singular() ) {

l10n/simple-lightbox.pot

@@ -1,218 +1,260 @@
-# Copyright (C) 2013 
-# This file is distributed under the same license as the  package.
+# Copyright (C) 2015 Simple Lightbox
+# This file is distributed under the same license as the Simple Lightbox package.
 msgid ""
 msgstr ""
-"Project-Id-Version:  \n"
-"Report-Msgid-Bugs-To: https://github.com/archetyped/simple-lightbox/wiki/Reporting-Issues\n"
-"POT-Creation-Date: 2013-04-16 00:22:28+00:00\n"
+"Project-Id-Version: Simple Lightbox 2.5.1\n"
+"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/simple-lightbox\n"
+"POT-Creation-Date: 2015-09-24 03:20:40+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2013-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2015-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 
-#: includes/class.admin.php:686
-msgid "The settings have been reset"
+#: controller.php:240
+msgid "Activation"
 msgstr ""
 
-#: includes/class.admin.php:687
-msgid "<strong class=\"%1$s\">Notice:</strong> This update is a <strong class=\"%1$s\">Beta version</strong>. It is highly recommended that you test the update on a test server before updating the plugin on a production server."
+#: controller.php:241
+msgid "Grouping"
 msgstr ""
 
-#: includes/class.admin.php:688 includes/class.admin.php:1394
-#: includes/class.admin.php:1443 includes/class.admin.php:1531
-msgid "Access Denied"
+#: controller.php:242
+msgid "UI"
 msgstr ""
 
-#: includes/class.admin.php:1318
-msgid "Save Changes"
+#: controller.php:243
+msgid "Labels"
 msgstr ""
 
-#: includes/class.fields.php:2223
-msgid "Default Element"
+#: controller.php:246
+msgid "Enable Lightbox Functionality"
 msgstr ""
 
-#: includes/class.fields.php:2235
-msgid "Default Element (Closed Tag)"
+#: controller.php:247
+msgid "Enable on Home page"
 msgstr ""
 
-#: includes/class.fields.php:2243
-msgid "Default Input Element"
+#: controller.php:248
+msgid "Enable on Single Posts"
 msgstr ""
 
-#: includes/class.fields.php:2251
-msgid "Text Box"
+#: controller.php:249
+msgid "Enable on Pages"
 msgstr ""
 
-#: includes/class.fields.php:2282
-msgid "Hidden Field"
+#: controller.php:250
+msgid "Enable on Archive Pages (tags, categories, etc.)"
 msgstr ""
 
-#: includes/class.fields.php:2288
-msgid "Select tag"
+#: controller.php:251
+msgid "Enable for Widgets"
 msgstr ""
 
-#: includes/class.fields.php:2300
-msgid "Inline wrapper"
+#: controller.php:252
+msgid "Group items (for displaying as a slideshow)"
 msgstr ""
 
-#: includes/class.options.php:115
-msgid "Enabled"
+#: controller.php:253
+msgid "Group items by Post (e.g. on pages with multiple posts)"
 msgstr ""
 
-#: includes/class.options.php:115
-msgid "Disabled"
+#: controller.php:254
+msgid "Group gallery items separately"
 msgstr ""
 
-#: includes/class.options.php:400
-msgid "Default"
+#: controller.php:255
+msgid "Group widget items separately"
 msgstr ""
 
-#: includes/class.themes.php:41
-msgid "Theme"
+#: controller.php:256
+msgid "Resize lightbox to fit in window"
 msgstr ""
 
-#: includes/class.themes.php:61
-msgid "Default (Light)"
+#: controller.php:257
+msgid "Enable animations"
 msgstr ""
 
-#: includes/class.themes.php:67
-msgid "Default (Dark)"
+#: controller.php:258
+msgid "Start Slideshow Automatically"
 msgstr ""
 
-#: model.php:151
-msgid "Activation"
+#: controller.php:259
+msgid "Slide Duration (Seconds)"
 msgstr ""
 
-#: model.php:152
-msgid "Grouping"
+#: controller.php:260
+msgid "Loop through items"
 msgstr ""
 
-#: model.php:153
-msgid "UI"
+#: controller.php:261
+msgid "Overlay Opacity (0 - 1)"
 msgstr ""
 
-#: model.php:154
-msgid "Labels"
+#: controller.php:262
+msgid "Enable default title"
 msgstr ""
 
-#: model.php:157
-msgid "Enable Lightbox Functionality"
+#: controller.php:263
+msgid "Loading indicator"
 msgstr ""
 
-#: model.php:158
-msgid "Enable on Home page"
+#: controller.php:264
+msgid "Close button"
 msgstr ""
 
-#: model.php:159
-msgid "Enable on Posts"
+#: controller.php:265
+msgid "Next Item button"
 msgstr ""
 
-#: model.php:160
-msgid "Enable on Pages"
+#: controller.php:266
+msgid "Previous Item button"
 msgstr ""
 
-#: model.php:161
-msgid "Enable on Archive Pages (tags, categories, etc.)"
+#: controller.php:267
+msgid "Start Slideshow button"
 msgstr ""
 
-#: model.php:162
-msgid "Enable for Widgets"
+#: controller.php:268
+msgid "Stop Slideshow button"
 msgstr ""
 
-#: model.php:163
-msgid "Group items (for displaying as a slideshow)"
+#: controller.php:269
+msgid "Slideshow status format"
 msgstr ""
 
-#: model.php:164
-msgid "Group items by Post (e.g. on pages with multiple posts)"
+#: controller.php:319
+msgid "Lightbox"
 msgstr ""
 
-#: model.php:165
-msgid "Group gallery items separately"
+#: controller.php:320
+msgid "Lightbox Settings"
 msgstr ""
 
-#: model.php:166
-msgid "Group widget items separately"
+#: controller.php:321
+msgid "Settings"
 msgstr ""
 
-#: model.php:167
-msgid "Resize lightbox to fit in window"
+#: controller.php:330
+msgid "Feedback & Support"
 msgstr ""
 
-#: model.php:168
-msgid "Enable animations"
+#: controller.php:335
+msgid "Reset"
 msgstr ""
 
-#: model.php:169
-msgid "Start Slideshow Automatically"
+#: controller.php:336
+msgid "Are you sure you want to reset settings?"
 msgstr ""
 
-#: model.php:170
-msgid "Slide Duration (Seconds)"
+#: controller.php:337
+msgid "Settings have been reset"
 msgstr ""
 
-#: model.php:171
-msgid "Loop through items"
+#: controller.php:338
+msgid "Settings were not reset"
 msgstr ""
 
-#: model.php:172
-msgid "Overlay Opacity (0 - 1)"
+#: controller.php:348
+msgid ""
+"<p>Simple Lightbox thrives on your feedback!</p><p>Click the button below to "
+"<strong>get help</strong>, <strong>request a feature</strong>, or "
+"<strong>provide some feedback</strong>!</p>"
 msgstr ""
 
-#: model.php:173
-msgid "Loading indicator"
+#: controller.php:352
+msgid "Get Support &amp; Provide Feedback"
 msgstr ""
 
-#: model.php:174
-msgid "Close button"
+#: includes/class.admin.php:644
+msgid "The settings have been reset"
 msgstr ""
 
-#: model.php:175
-msgid "Next Item button"
+#: includes/class.admin.php:645
+msgid ""
+"<strong class=\"%1$s\">Notice:</strong> This update is a <strong class=\"%1$s"
+"\">Beta version</strong>. It is highly recommended that you test the update "
+"on a test server before updating the plugin on a production server."
 msgstr ""
 
-#: model.php:176
-msgid "Previous Item button"
+#: includes/class.admin.php:646 includes/class.admin_action.php:45
+#: includes/class.admin_page.php:146
+msgid "Access Denied"
 msgstr ""
 
-#: model.php:177
-msgid "Start Slideshow button"
+#: includes/class.fields.php:43
+msgid "Default Element"
 msgstr ""
 
-#: model.php:178
-msgid "Stop Slideshow button"
+#: includes/class.fields.php:55
+msgid "Default Element (Closed Tag)"
 msgstr ""
 
-#: model.php:179
-msgid "Slideshow status format"
+#: includes/class.fields.php:63
+msgid "Default Input Element"
 msgstr ""
 
-#: model.php:228
-msgid "Lightbox"
+#: includes/class.fields.php:71
+msgid "Text Box"
 msgstr ""
 
-#: model.php:229
-msgid "Lightbox Settings"
+#: includes/class.fields.php:102
+msgid "Hidden Field"
 msgstr ""
 
-#: model.php:230
-msgid "Settings"
+#: includes/class.fields.php:108
+msgid "Select tag"
 msgstr ""
 
-#: model.php:234
-msgid "Reset"
+#: includes/class.fields.php:120
+msgid "Inline wrapper"
 msgstr ""
 
-#: model.php:235
-msgid "Are you sure you want to reset settings?"
+#: includes/class.option.php:113
+msgid "Enabled"
 msgstr ""
 
-#: model.php:236
-msgid "Settings have been reset"
+#: includes/class.option.php:113
+msgid "Disabled"
 msgstr ""
 
-#: model.php:237
-msgid "Settings were not reset"
+#: includes/class.options.php:222
+msgid "Default"
+msgstr ""
+
+#: includes/class.themes.php:40
+msgid "Theme"
+msgstr ""
+
+#: includes/class.themes.php:65
+msgid "Baseline"
+msgstr ""
+
+#: includes/class.themes.php:76
+msgid "Default (Light)"
+msgstr ""
+
+#: includes/class.themes.php:87
+msgid "Default (Dark)"
+msgstr ""
+
+#. Plugin Name of the plugin/theme
+msgid "Simple Lightbox"
+msgstr ""
+
+#. Plugin URI of the plugin/theme
+msgid "http://archetyped.com/tools/simple-lightbox/"
+msgstr ""
+
+#. Description of the plugin/theme
+msgid "The highly customizable lightbox for WordPress"
+msgstr ""
+
+#. Author of the plugin/theme
+msgid "Archetyped"
+msgstr ""
+
+#. Author URI of the plugin/theme
+msgid "http://archetyped.com"
 msgstr ""