Changeset 633 for team

Show
Ignore:
Timestamp:
09/15/07 23:01:05 (14 months ago)
Author:
www-data
Message:

automerge commit

Location:
team/michiel/import_blogs
Files:
7 modified

Legend:

Unmodified
Added
Removed

  • team/michiel/import_blogs

    • Property svnmerge-integrated changed from /trunk:1-630 to /trunk:1-632

  • team/michiel/import_blogs/common/mvblog_admin.php

    r616 r633  
    336336                                                $count = $r->fetchRow(MDB2_FETCHMODE_ASSOC); 
    337337                                        ?> 
    338                                         <h2 class="log_post_h2"><?php echo sprintf(ngettext("%d article in this categorie", "%d articles in this categorie", $count["count"]), $count["count"]); ?></h2> 
     338                                        <h2 class="log_post_h2"><?php echo sprintf(ngettext("%d article in this category", "%d articles in this category", $count["count"]), $count["count"]); ?></h2> 
    339339                                </div> 
    340340                                <div class="log_post_body"> 
    … …  
    376376                                        $count = $r->fetchRow(MDB2_FETCHMODE_ASSOC); 
    377377                                ?> 
    378                                 <h2 class="log_post_h2"><?php echo sprintf(ngettext("%d article in this categorie", "%d articles in this categorie", $count["count"]), $count["count"]); ?></h2> 
     378                                <h2 class="log_post_h2"><?php echo sprintf(ngettext("%d article in this category", "%d articles in this category", $count["count"]), $count["count"]); ?></h2> 
    379379                        </div> 
    380380                        <div class="log_post_body"> 

  • team/michiel/import_blogs/common/mvblog_common.php

    r631 r633  
    495495                $categories = array( 
    496496                        0 => array( 
    497                                 "name"   => "Categorie Name", 
    498                                 "desc"   => "Categorie Description", 
     497                                "name"   => "Category Name", 
     498                                "desc"   => "Category Description", 
    499499                                "public" => 1, 
    500500                                "active" => 1 

  • team/michiel/import_blogs/locale/nl_NL/LC_MESSAGES/messages.po

    r539 r633  
    5656#: common/mvblog_admin.php:352 common/mvblog_admin.php:392 
    5757#, php-format 
    58 msgid "%d article in this categorie" 
    59 msgid_plural "%d articles in this categorie" 
     58msgid "%d article in this category" 
     59msgid_plural "%d articles in this category" 
    6060msgstr[0] "%d artikel in deze categorie" 
    6161msgstr[1] "%d artikelen in deze categorie" 

  • team/michiel/import_blogs/locale/sv_SE/LC_MESSAGES/messages.po

    r541 r633  
    6060#: common/mvblog_admin.php:352 common/mvblog_admin.php:392 
    6161#, php-format 
    62 msgid "%d article in this categorie" 
    63 msgid_plural "%d articles in this categorie" 
     62msgid "%d article in this category" 
     63msgid_plural "%d articles in this category" 
    6464msgstr[0] "%d artikel i den h&auml;r kategorin" 
    6565msgstr[1] "%d artiklar i den h&auml;r kategorin"