Changeset 16630

Timestamp:

11/30/2010 08:38:12 PM (14 years ago)

Author:

nacin

Message:

Complete Twenty Ten 1.1 merge.

Location:

branches/3.0/wp-content/themes/twentyten

Files:

• attachment.php (modified) (1 prop)
• languages/twentyten.pot (modified) (10 diffs)
• loop-attachment.php (deleted)
• loop-page.php (deleted)
• loop-single.php (deleted)
• page.php (modified) (1 prop)
• single.php (modified) (1 prop)

branches/3.0/wp-content/themes/twentyten/languages/twentyten.pot

@@ -1 @@
-# Translation of the WordPress theme Twenty Ten 1.2-RC1 by the WordPress team.
+# Translation of the WordPress theme Twenty Ten 1.1 by the WordPress team.
 # Copyright (C) 2010 the WordPress team
 # This file is distributed under the same license as the Twenty Ten package.
@@ -7 +7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Twenty Ten 1.2-RC1\n"
+"Project-Id-Version: Twenty Ten 1.1\n"
 "Report-Msgid-Bugs-To: http://wordpress.org/tag/twentyten\n"
-"POT-Creation-Date: 2010-11-06 00:21+0000\n"
+"POT-Creation-Date: 2010-07-14 16:21+0000\n"
 "PO-Revision-Date: 2010-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -47 +47 @@
 msgstr ""
 
+#: attachment.php:18
+#, php-format
+msgid "Return to %s"
+msgstr ""
+
+#. translators: %s - title of parent post
+#: attachment.php:20
+#, php-format
+msgid "<span class=\"meta-nav\">&larr;</span> %s"
+msgstr ""
+
+#: attachment.php:29
+#, php-format
+msgid "<span class=\"%1$s\">By</span> %2$s"
+msgstr ""
+
+#: attachment.php:33 functions.php:451
+#, php-format
+msgid "View all posts by %s"
+msgstr ""
+
+#: attachment.php:40
+#, php-format
+msgid "<span class=\"%1$s\">Published</span> %2$s"
+msgstr ""
+
+#: attachment.php:50
+#, php-format
+msgid "Full size is %s pixels"
+msgstr ""
+
+#: attachment.php:53
+msgid "Link to full-size image"
+msgstr ""
+
+#: attachment.php:60 attachment.php:107 loop.php:95 loop.php:118 loop.php:160
+#: onecolumn-page.php:27 page.php:32 single.php:53
+msgid "Edit"
+msgstr ""
+
+#: attachment.php:100 functions.php:241 loop.php:110 loop.php:138
+msgid "Continue reading <span class=\"meta-nav\">&rarr;</span>"
+msgstr ""
+
+#: attachment.php:101 loop.php:139 onecolumn-page.php:26 page.php:31
+#: single.php:31
+msgid "Pages:"
+msgstr ""
+
 #: author.php:27
 #, php-format
@@ -52 +101 @@
 msgstr ""
 
-#: author.php:37 loop-single.php:43
+#: author.php:37 single.php:40
 #, php-format
 msgid "About %s"
@@ -86 +135 @@
 msgstr ""
 
-#. #-#-#-#-#  twentyten.pot (Twenty Ten 1.2-RC1)  #-#-#-#-#
+#. #-#-#-#-#  twentyten.pot (Twenty Ten 1.1)  #-#-#-#-#
 #. Theme URI of the plugin/theme
 #: footer.php:33
@@ -145 +194 @@
 msgstr ""
 
-#: functions.php:241 loop-attachment.php:103 loop.php:110 loop.php:138
-msgid "Continue reading <span class=\"meta-nav\">&rarr;</span>"
-msgstr ""
-
 #: functions.php:308
 #, php-format
@@ -227 +272 @@
 msgstr ""
 
-#: functions.php:451 loop-attachment.php:36
-#, php-format
-msgid "View all posts by %s"
-msgstr ""
-
 #: functions.php:468
 #, php-format
@@ -260 +300 @@
 #: header.php:83
 msgid "Skip to content"
-msgstr ""
-
-#: loop-attachment.php:21
-#, php-format
-msgid "Return to %s"
-msgstr ""
-
-#. translators: %s - title of parent post
-#: loop-attachment.php:23
-#, php-format
-msgid "<span class=\"meta-nav\">&larr;</span> %s"
-msgstr ""
-
-#: loop-attachment.php:32
-#, php-format
-msgid "<span class=\"%1$s\">By</span> %2$s"
-msgstr ""
-
-#: loop-attachment.php:43
-#, php-format
-msgid "<span class=\"%1$s\">Published</span> %2$s"
-msgstr ""
-
-#: loop-attachment.php:53
-#, php-format
-msgid "Full size is %s pixels"
-msgstr ""
-
-#: loop-attachment.php:56
-msgid "Link to full-size image"
-msgstr ""
-
-#: loop-attachment.php:63 loop-attachment.php:110 loop-page.php:30
-#: loop-single.php:56 loop.php:95 loop.php:118 loop.php:160
-msgid "Edit"
-msgstr ""
-
-#: loop-attachment.php:104 loop-page.php:29 loop-single.php:34 loop.php:139
-msgid "Pages:"
-msgstr ""
-
-#: loop-single.php:21 loop-single.php:61
-msgctxt "Previous post link"
-msgid "&larr;"
-msgstr ""
-
-#: loop-single.php:22 loop-single.php:62
-msgctxt "Next post link"
-msgid "&rarr;"
-msgstr ""
-
-#: loop-single.php:47
-#, php-format
-msgid "View all posts by %s <span class=\"meta-nav\">&rarr;</span>"
 msgstr ""
 
@@ -401 +387 @@
 #: sidebar.php:34
 msgid "Meta"
+msgstr ""
+
+#: single.php:18 single.php:58
+msgctxt "Previous post link"
+msgid "&larr;"
+msgstr ""
+
+#: single.php:19 single.php:59
+msgctxt "Next post link"
+msgid "&rarr;"
+msgstr ""
+
+#: single.php:44
+#, php-format
+msgid "View all posts by %s <span class=\"meta-nav\">&rarr;</span>"
 msgstr ""
 
@@ -432 +433 @@
 "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"
-msgstr ""
+"rtl-language-support, editor-style"
+msgstr ""