Merge remote-tracking branch 'refs/remotes/origin/master' into latest

README.md

@@ -1,7 +1,7 @@
 Project Nami
 ===============
 
-### Version: `1.7.1` ###
+### Version: `1.7.2` ###
 
 ### Description: ###
 [![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://deploy.azure.com/?repository=https://github.com/ProjectNami/projectnami/tree/latest)

license.txt

@@ -1,6 +1,6 @@
-WordPress - Web publishing software
+Project Nami - Web publishing software for the Windows Azure platform
 
-Copyright 2011-2017 by the contributors
+Copyright 2013-2018 by the contributors
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -31,10 +31,18 @@ and
 
   WordPress - Web publishing software
 
-  Copyright 2003-2010 by the contributors
+  Copyright 2011-2018 by the contributors
 
   WordPress is released under the GPL
 
+and
+
+  WP Database Abstraction - DB abstraction plugin for WordPress
+
+  Contribitors: omniti, A.Garcia & A.Gentile
+
+  WP Database Abstraction is released under the GPL
+
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
                     GNU GENERAL PUBLIC LICENSE

wp-admin/about.php

@@ -32,6 +32,24 @@
 
 		<div class="changelog point-releases">
 			<h3><?php _e( 'Maintenance and Security Releases' ); ?></h3>
+			<p>
+				<?php
+				printf(
+					/* translators: 1: WordPress version number, 2: plural number of bugs. */
+					_n(
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.',
+						22
+					),
+					'4.9.2',
+					number_format_i18n( 22 )
+				);
+				?>
+				<?php
+				/* translators: %s: Codex URL */
+				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.2' );
+				?>
+			</p>
 			<p>
 				<?php
 				printf(

wp-admin/css/common-rtl.css

@@ -1188,11 +1188,19 @@ th.action-links {
 
 .filter-drawer .filter-group-feature input,
 .filter-drawer .filter-group-feature label {
-	display: inline-block;
-	margin: 7px 0 7px 4px;
 	line-height: 16px;
 }
 
+.filter-drawer .filter-group-feature input {
+	position: absolute;
+	margin: 0;
+}
+
+.filter-group .filter-group-feature label {
+	display: block;
+	margin: 14px 23px 14px 0px;
+}
+
 .filter-drawer .buttons {
 	clear: both;
 	margin-bottom: 20px;
@@ -3889,6 +3897,10 @@ img {
 		line-height: 25px;
 	}
 
+	.filter-drawer .filter-group-feature label {
+		margin-right: 32px;
+	}
+
 	.wp-filter .button.drawer-toggle {
 		font-size: 13px;
 		line-height: 26px;

wp-admin/css/common.css

@@ -1188,11 +1188,19 @@ th.action-links {
 
 .filter-drawer .filter-group-feature input,
 .filter-drawer .filter-group-feature label {
-	display: inline-block;
-	margin: 7px 4px 7px 0;
 	line-height: 16px;
 }
 
+.filter-drawer .filter-group-feature input {
+	position: absolute;
+	margin: 0;
+}
+
+.filter-group .filter-group-feature label {
+	display: block;
+	margin: 14px 0px 14px 23px;
+}
+
 .filter-drawer .buttons {
 	clear: both;
 	margin-bottom: 20px;
@@ -3889,6 +3897,10 @@ img {
 		line-height: 25px;
 	}
 
+	.filter-drawer .filter-group-feature label {
+		margin-left: 32px;
+	}
+
 	.wp-filter .button.drawer-toggle {
 		font-size: 13px;
 		line-height: 26px;

wp-admin/css/customize-nav-menus-rtl.css

@@ -216,6 +216,10 @@
 	padding-top: 12px;
 }
 
+.menu-location-settings .customize-control-checkbox .theme-location-set {
+	line-height: 1;
+}
+
 .customize-control-nav_menu_auto_add label {
 	vertical-align: top;
 }

wp-admin/css/customize-nav-menus.css

@@ -216,6 +216,10 @@
 	padding-top: 12px;
 }
 
+.menu-location-settings .customize-control-checkbox .theme-location-set {
+	line-height: 1;
+}
+
 .customize-control-nav_menu_auto_add label {
 	vertical-align: top;
 }