Fw: cvs: php-gtk-doc /manual/pt_BR translation.xml

15 of the 17 files I just went to commit have conflicts....

<sigh />


> Hi Fernando,
>
> Can you please hold off the commits for now?
>
> There's something wrong somewhere, there hasn't been an automated pt_BR 
> manual build since October 9th - and you've been committing daily since 
> the 11th.
> I'm still trying to get it to build locally without crashing my laptop :(
>
> - Steph
>
>
> ----- Original Message ----- 
> From: "Fernando Correa da Conceição" <fernandoc@xxxxxxx>
> To: <php-gtk-doc@xxxxxxxxxxxxx>
> Sent: Monday, October 16, 2006 5:35 AM
> Subject: [PHP-GTK-DOC] cvs: php-gtk-doc /manual/pt_BR translation.xml
>
>
> > fernandoc Mon Oct 16 03:35:52 2006 UTC
> >
> >  Modified files:
> >    /php-gtk-doc/manual/pt_BR translation.xml
> >  Log:
> >  New work for Diego
> >
> > http://cvs.php.net/viewvc.cgi/php-gtk-doc/manual/pt_BR/translation.xml?r1=1.6&r2=1.7&diff_format=u
> > Index: php-gtk-doc/manual/pt_BR/translation.xml
> > diff -u php-gtk-doc/manual/pt_BR/translation.xml:1.6 
> > php-gtk-doc/manual/pt_BR/translation.xml:1.7
> > --- php-gtk-doc/manual/pt_BR/translation.xml:1.6 Mon Oct 16 00:32:18 2006
> > +++ php-gtk-doc/manual/pt_BR/translation.xml Mon Oct 16 03:35:52 2006
> > @@ -22,7 +22,7 @@
> >         date->a data que começou, formato aaaa.mm.dd
> >     -->
> >     <file name="gobject, gtkbutton. gtkcheckbutton, gtkentry, 
> > gtkexpander, gtkhbox, gtkvbox, gtkhpaned, gtkvpaned" person="fernandoc" 
> > type="translation" date="2006.10.15"/>
> > -    <file name="/glade" person="dnfeitosa" type="translation" 
> > date="2006.10.07"/>
> > +    <file name="gtkcell*" person="dnfeitosa" type="translation" 
> > date="2006.10.07"/>
> >    </work-in-progress>
> >
> > <!--
> >
> > --
> > PHP-GTK Documentation Mailing List (http://gtk.php.net/)
> > To unsubscribe, visit: http://www.php.net/unsub.php
> >
> >
> > __________ NOD32 1.1380 (20060125) Information __________
> >
> > This message was checked by NOD32 antivirus system.
> > http://www.eset.com
> --
> PHP-GTK Documentation Mailing List (http://gtk.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
> __________ NOD32 1.1380 (20060125) Information __________
>
> This message was checked by NOD32 antivirus system.
> http://www.eset.com
--
PHP-GTK Documentation Mailing List (http://gtk.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php