Merge branch 'master' into ja

* master:
  Improve Post Format Archive heads. Follows up on Automattic#95 and Automattic@e3b4907#diff-ff638db82c6ac72a05781ba3e086fdf0L48.
  Apply a natural box layout model to all elements; see Automattic#341.

archive.php

@@ -47,6 +47,9 @@
 						elseif ( is_tax( 'post_format', 'post-format-aside' ) ) :
 							_e( 'Asides', '_s' );
 
+						elseif ( is_tax( 'post_format', 'post-format-gallery' ) ) :
+							_e( 'Galleries', '_s');
+
 						elseif ( is_tax( 'post_format', 'post-format-image' ) ) :
 							_e( 'Images', '_s');
 
@@ -59,6 +62,15 @@
 						elseif ( is_tax( 'post_format', 'post-format-link' ) ) :
 							_e( 'Links', '_s' );
 
+						elseif ( is_tax( 'post_format', 'post-format-status' ) ) :
+							_e( 'Statuses', '_s' );
+
+						elseif ( is_tax( 'post_format', 'post-format-audio' ) ) :
+							_e( 'Audios', '_s' );
+
+						elseif ( is_tax( 'post_format', 'post-format-chat' ) ) :
+							_e( 'Chats', '_s' );
+
 						else :
 							_e( 'Archives', '_s' );
 

style.css

@@ -50,6 +50,13 @@ html {
 	-webkit-text-size-adjust: 100%; /* Prevents iOS text size adjust after orientation change, without disabling user zoom */
 	-ms-text-size-adjust:     100%; /* www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/ */
 }
+*,
+*:before,
+*:after { /* apply a natural box layout model to all elements; see http://www.paulirish.com/2012/box-sizing-border-box-ftw/ */
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+}
 body {
 	background: #fff;
 }
@@ -264,7 +271,6 @@ input[type="submit"]:active {
 }
 input[type="checkbox"],
 input[type="radio"] {
-	box-sizing: border-box; /* Addresses box sizing set to content-box in IE8/9 */
 	padding: 0; /* Addresses excess padding in IE8/9 */
 }
 input[type="search"] {