Merge remote-tracking branch 'upstream/master' into ja

* upstream/master:
  Revert Automattic#638 for a bit.
  Update POT. Fixes Automattic#645.
  Load parent styles when child theme is activated

Conflicts:
	languages/_s.pot

languages/_s.pot

@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: _s 1.0-wpcom\n"
 "Report-Msgid-Bugs-To: http://wordpress.org/tags/_s\n"
-"POT-Creation-Date: 2014-11-13 01:51:13+00:00\n"
+"POT-Creation-Date: 2014-12-08 02:19:00+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -100,19 +100,19 @@ msgstr ""
 msgid "Theme: %1$s by %2$s."
 msgstr ""
 
-#: functions.php:45 header.php:32
+#: functions.php:53 header.php:31
 msgid "Primary Menu"
 msgstr ""
 
-#: functions.php:80
+#: functions.php:88
 msgid "Sidebar"
 msgstr ""
 
-#: header.php:23
+#: header.php:22
 msgid "Skip to content"
 msgstr ""
 
-#: inc/extras.php:63
+#: inc/extras.php:64
 msgid "Page %s"
 msgstr ""
 

languages/ja.po

@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: _s 1.0-wpcom\n"
 "Report-Msgid-Bugs-To: http://wordpress.org/tags/_s\n"
-"POT-Creation-Date: 2014-11-13 01:51:13+00:00\n"
+"POT-Creation-Date: 2014-12-08 02:19:00+00:00\n"
 "Last-Translator: Kazue Igarashi <gatesapce.k@gmail.com>\n"
 "Language-Team: \n"
 "Language: JAPANESE\n"
@@ -106,19 +106,19 @@ msgstr "Proudly powered by %s"
 msgid "Theme: %1$s by %2$s."
 msgstr "テーマ: %1$s by %2$s."
 
-#: functions.php:45 header.php:32
+#: functions.php:53 header.php:31
 msgid "Primary Menu"
 msgstr "メインメニュー"
 
-#: functions.php:80
+#: functions.php:88
 msgid "Sidebar"
 msgstr "サイドバー"
 
-#: header.php:23
+#: header.php:22
 msgid "Skip to content"
 msgstr "コンテンツへスキップ"
 
-#: inc/extras.php:63
+#: inc/extras.php:64
 msgid "Page %s"
 msgstr "ページ %s"