Ticket #21442: 21442.patch

wp-content/themes/twentyten/style.css

@@ -6 +6 @@
 Version: 1.4
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
-Tags: black, blue, white, two-columns, fixed-width, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style, custom-menu
+Tags: black, blue, white, two-columns, fixed-layout, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style, custom-menu, flexible-header
 Text Domain: twentyten
 */
 

wp-content/themes/twentytwelve/style.css

@@ -7 +7 @@
 Version: 0.6
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
-Tags: light, gray, white, one-column, two-columns, right-sidebar, flexible-width, responsive-width, custom-background, custom-header, custom-menu, featured-images, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
+Tags: light, gray, white, one-column, two-columns, right-sidebar, fluid-layout, responsive-layout, custom-background, custom-header, custom-menu, featured-images, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
 Text Domain: twentytwelve
 
 This theme, like WordPress, is licensed under the GPL.

wp-content/themes/twentyeleven/style.css

@@ -7 +7 @@
 Version: 1.4
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
-Tags: dark, light, white, black, gray, one-column, two-columns, left-sidebar, right-sidebar, fixed-width, flexible-width, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-image-header, featured-images, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
+Tags: dark, light, white, black, gray, one-column, two-columns, left-sidebar, right-sidebar, fixed-layout, fluid-layout, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-image-header, featured-images, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
 Text Domain: twentyeleven
 */
 

wp-admin/includes/theme.php

@@ -178 +178 @@
                         'right-sidebar' => __( 'Right Sidebar' ),
                 ),
 
-                __('Width') => array(
-                        'fixed-width'    => __( 'Fixed Width' ),
-                        'flexible-width' => __( 'Flexible Width' ),
+                __( 'Layout' ) => array(
+                        'fixed-layout'      => __( 'Fixed Layout' ),
+                        'fluid-layout'      => __( 'Flexible Layout' ),
+                        'responsive-layout' => __( 'Responsive Layout' ),
                 ),
 
                 __( 'Features' ) => array(