Changeset 2386:4366d039e3f2

Timestamp:

10/16/13 11:10:54 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.6

Message:

Better sentences for filtered list of comments/trackbacks, fixes #1779

Files:

• inc/admin/lib.pager.php (modified) (1 diff)
• locales/_pot/main.pot (modified) (12 diffs)
• locales/_pot/plugins.pot (modified) (1 diff)
• locales/en/main.po (modified) (2 diffs)
• locales/en/plugins.po (modified) (1 diff)
• locales/fr/main.po (modified) (3 diffs)
• locales/fr/plugins.po (modified) (1 diff)
• locales/fr/public.po (modified) (2 diffs)

inc/admin/lib.pager.php

@@ -399 +399 @@
                
                if( $filter ) {
-                    $html_block .= '<caption>'.sprintf(__('List of %s Comments or trackbacks match the filter.'), $this->rs_count).'</caption>';
+                    $html_block .= '<caption>'.
+                         sprintf(__(
+                              'Comment or trackback matching the filter.',
+                              'List of %s comments or trackbacks matching the filter.',
+                              $this->rs_count), $this->rs_count).
+                         '</caption>';
                } else {
                     $html_block .= '<caption class="hidden">'.__('Comments and trackbacks list').'</caption>';

locales/_pot/main.pot

@@ -8 +8 @@
 "Project-Id-Version: Dotclear 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-16 11:00+0200\n"
+"POT-Creation-Date: 2013-10-16 11:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -865 +865 @@
 msgstr ""
 
-#: admin/blogs.php:159 inc/admin/lib.pager.php:532
+#: admin/blogs.php:159 inc/admin/lib.pager.php:537
 msgid "Entries (all types)"
 msgstr ""
@@ -872 +872 @@
 #: admin/post.php:834 admin/posts.php:100 admin/users_actions.php:219
 #: inc/admin/actions/class.dcactionposts.php:104 inc/admin/lib.pager.php:189
-#: inc/admin/lib.pager.php:299 inc/admin/lib.pager.php:410
+#: inc/admin/lib.pager.php:299 inc/admin/lib.pager.php:415
 msgid "Status"
 msgstr ""
@@ -1161 +1161 @@
 #: admin/comments.php:43 admin/post.php:832 admin/posts.php:96
 #: inc/admin/lib.pager.php:184 inc/admin/lib.pager.php:297
-#: inc/admin/lib.pager.php:409
+#: inc/admin/lib.pager.php:414
 msgid "Date"
 msgstr ""
@@ -1171 +1171 @@
 #: admin/comments.php:45 admin/post.php:831 admin/posts.php:99
 #: inc/admin/actions/class.dcactioncomments.php:78 inc/admin/lib.pager.php:186
-#: inc/admin/lib.pager.php:298 inc/admin/lib.pager.php:408
+#: inc/admin/lib.pager.php:298 inc/admin/lib.pager.php:413
 msgid "Author"
 msgstr ""
@@ -2369 +2369 @@
 
 #: admin/post.php:353 admin/post.php:851 inc/admin/lib.pager.php:231
-#: inc/admin/lib.pager.php:328 inc/admin/lib.pager.php:457
+#: inc/admin/lib.pager.php:328 inc/admin/lib.pager.php:462
 #: inc/core/class.dc.blog.php:96 inc/core/class.dc.blog.php:101
 msgid "Published"
@@ -2375 +2375 @@
 
 #: admin/post.php:356 admin/post.php:854 inc/admin/lib.pager.php:234
-#: inc/admin/lib.pager.php:331 inc/admin/lib.pager.php:460
+#: inc/admin/lib.pager.php:331 inc/admin/lib.pager.php:465
 #: inc/core/class.dc.blog.php:95 inc/core/class.dc.blog.php:100
 msgid "Unpublished"
@@ -2386 +2386 @@
 
 #: admin/post.php:362 admin/post.php:857 inc/admin/lib.pager.php:240
-#: inc/admin/lib.pager.php:337 inc/admin/lib.pager.php:463
+#: inc/admin/lib.pager.php:337 inc/admin/lib.pager.php:468
 #: inc/core/class.dc.blog.php:93 inc/core/class.dc.blog.php:99
 msgid "Pending"
@@ -2461 +2461 @@
 msgstr ""
 
-#: admin/post.php:502 inc/admin/lib.pager.php:403
+#: admin/post.php:502 inc/admin/lib.pager.php:408
 msgid "Comments and trackbacks list"
 msgstr ""
@@ -2571 +2571 @@
 msgstr ""
 
-#: admin/post.php:835 admin/post.php:875 inc/admin/lib.pager.php:486
+#: admin/post.php:835 admin/post.php:875 inc/admin/lib.pager.php:491
 msgid "Edit"
 msgstr ""
 
-#: admin/post.php:860 inc/admin/lib.pager.php:466
+#: admin/post.php:860 inc/admin/lib.pager.php:471
 #: inc/core/class.dc.blog.php:98
 msgid "Junk"
@@ -3092 +3092 @@
 msgstr ""
 
-#: admin/users.php:19 inc/admin/lib.pager.php:528
+#: admin/users.php:19 inc/admin/lib.pager.php:533
 msgid "Username"
 msgstr ""
 
-#: admin/users.php:20 inc/admin/lib.pager.php:530
+#: admin/users.php:20 inc/admin/lib.pager.php:535
 msgid "Last Name"
 msgstr ""
 
-#: admin/users.php:21 inc/admin/lib.pager.php:529
+#: admin/users.php:21 inc/admin/lib.pager.php:534
 msgid "First Name"
 msgstr ""
 
-#: admin/users.php:22 inc/admin/lib.pager.php:531
+#: admin/users.php:22 inc/admin/lib.pager.php:536
 msgid "Display name"
 msgstr ""
@@ -4119 +4119 @@
 msgstr ""
 
-#: inc/admin/lib.pager.php:401
-#, php-format
-msgid "List of %s Comments or trackbacks match the filter."
-msgstr ""
-
-#: inc/admin/lib.pager.php:407
+#: inc/admin/lib.pager.php:403
+#, php-format
+msgid "Comment or trackback matching the filter."
+msgid_plural "List of %s comments or trackbacks matching the filter."
+msgstr[0] ""
+msgstr[1] ""
+
+#: inc/admin/lib.pager.php:412
 msgid "Type"
 msgstr ""
 
-#: inc/admin/lib.pager.php:411
+#: inc/admin/lib.pager.php:416
 msgid "Entry"
 msgstr ""
 
-#: inc/admin/lib.pager.php:474
+#: inc/admin/lib.pager.php:479
 #, php-format
 msgid "Edit the %1$s from %2$s"
 msgstr ""
 
-#: inc/admin/lib.pager.php:475 inc/admin/lib.pager.php:487
+#: inc/admin/lib.pager.php:480 inc/admin/lib.pager.php:492
 msgid "comment"
 msgstr ""
 
-#: inc/admin/lib.pager.php:475 inc/admin/lib.pager.php:487
+#: inc/admin/lib.pager.php:480 inc/admin/lib.pager.php:492
 msgid "trackback"
 msgstr ""
 
-#: inc/admin/lib.pager.php:484
+#: inc/admin/lib.pager.php:489
 msgid "Type and author"
 msgstr ""
 
-#: inc/admin/lib.pager.php:508
+#: inc/admin/lib.pager.php:513
 msgid "No user matches the filter"
 msgstr ""
 
-#: inc/admin/lib.pager.php:510
+#: inc/admin/lib.pager.php:515
 msgid "No user"
 msgstr ""
 
-#: inc/admin/lib.pager.php:522
+#: inc/admin/lib.pager.php:527
 #, php-format
 msgid "List of %s users match the filter."
 msgstr ""
 
-#: inc/admin/lib.pager.php:524
+#: inc/admin/lib.pager.php:529
 msgid "Users list"
 msgstr ""
 
-#: inc/admin/lib.pager.php:564
+#: inc/admin/lib.pager.php:569
 msgid "admin"
 msgstr ""
 
-#: inc/admin/lib.pager.php:567
+#: inc/admin/lib.pager.php:572
 msgid "superadmin"
 msgstr ""

locales/_pot/plugins.pot

@@ -8 +8 @@
 "Project-Id-Version: Dotclear 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-16 11:00+0200\n"
+"POT-Creation-Date: 2013-10-16 11:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

locales/en/main.po

@@ -8 +8 @@
 "Project-Id-Version: Dotclear 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-16 10:55+0200\n"
+"POT-Creation-Date: 2013-10-16 11:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -3013 +3013 @@
 
 #, php-format
-msgid "List of %s Comments or trackbacks match the filter."
-msgstr ""
+msgid "Comment or trackback matching the filter."
+msgid_plural "List of %s comments or trackbacks matching the filter."
+msgstr[0] ""
+msgstr[1] ""
 
 msgid "Type"

locales/en/plugins.po

@@ -8 +8 @@
 "Project-Id-Version: Dotclear 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-16 10:55+0200\n"
+"POT-Creation-Date: 2013-10-16 11:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

locales/fr/main.po

@@ -11 +11 @@
 "Project-Id-Version: Dotclear\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-16 11:00+0200\n"
+"POT-Creation-Date: 2013-10-16 11:07+0200\n"
 "PO-Revision-Date: 2012-08-13 07:13+0000\n"
 "Last-Translator: xave <xave@dotclear.net>\n"
@@ -3023 +3023 @@
 
 msgid "No comments or trackbacks matches the filter"
-msgstr "aucun commentaire ou rétrolien correspondant au filtre"
-
-#, php-format
-msgid "List of %s Comments or trackbacks match the filter."
-msgstr "Liste des %s commentaires ou rétroliens correspondant au filtre"
+msgstr "aucun commentaire ou rétrolien ne correspond au filtre"
+
+#, php-format
+msgid "Comment or trackback matching the filter."
+msgid_plural "List of %s comments or trackbacks matching the filter."
+msgstr[0] "Commentaire ou rétrolien correspondant au filtre."
+msgstr[1] "Liste des %s commentaires ou rétroliens correspondants au filtre."
 
 msgid "Type"
@@ -3589 +3591 @@
 msgstr "L'erreur suivante a été rencontrée lors de la tentative d'accès à la base de données :"
 
+#~ msgid "List of %s Comments or trackbacks match the filter."
+#~ msgstr "Liste des %s commentaires ou rétroliens correspondant au filtre"
+
 #~ msgid "%d comments"
 #~ msgid_plural "%d comments"

locales/fr/plugins.po

@@ -11 +11 @@
 "Project-Id-Version: Dotclear\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-16 11:00+0200\n"
+"POT-Creation-Date: 2013-10-16 11:07+0200\n"
 "PO-Revision-Date: 2012-11-06 10:04+0100\n"
 "Last-Translator: Franck Paul <carnet.franck.paul@gmail.com>\n"

locales/fr/public.po

@@ -38 +38 @@
 msgstr "Le"
 
-msgid "in"
-msgstr "dans"
-
-msgid "In"
-msgstr "Dans"
-
 msgid "Continue reading"
 msgstr "Lire la suite"
@@ -247 +241 @@
 msgid "Read"
 msgstr "Lire"
+
+#~ msgid "in"
+#~ msgstr "dans"
+
+#~ msgid "In"
+#~ msgstr "Dans"