website

[Alexandre Prokoudine]

Hi,

For some reason I'm not able to commit a whole new translation
(Ukrainian) of the website to htdocs/locale/.

I'm trying to do it again, but now it says

cvs add: locale/uk.po added independently by second party
avp@traveller:~/soft/svn/htdocs$ cvs commit locale/uk.po
cvs commit: use `cvs add' to create an entry for `locale/uk.po'
cvs [commit aborted]: correct above errors first!

Any helpers? :)

Alexandre

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Audacity-devel mailing list
Audacity-devel@...
https://lists.sourceforge.net/lists/listinfo/audacity-devel

[Arturo 'Buanzo' Busleiman]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Well, there you go.

Just run "cvs add uk.po" in the locale/ directory of your local copy.

THEN do cvs commit -m "new ukranian translation" uk.po



- --
Arturo "Buanzo" Busleiman
Reliable inter-continental Mail Relay Service - Ask me!
Independent Security Consultant - SANS - OISSG
http://www.buanzo.com.ar/pro/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIIGrEAlpOsGhXcE0RCluBAJ0dCpBkLspmRpMCh9EbfP1CTwC9agCdFvXj
kn7y9NDwwr/0pN1LCXurdwM=
=ApfA
-----END PGP SIGNATURE-----

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Audacity-devel mailing list
Audacity-devel@...
https://lists.sourceforge.net/lists/listinfo/audacity-devel

[Richard Ash (audacity-help)]

On Tue, 2008-05-06 at 11:27 -0300, Arturo 'Buanzo' Busleiman wrote:
> Well, there you go.
>
> Just run "cvs add uk.po" in the locale/ directory of your local copy.
>
> THEN do cvs commit -m "new ukranian translation" uk.po

If (as I suspect) you get an error then:
* Back up the uk.po file
* run cvs up to update your local copy (which may produce a uk.po file)
* restore the correct uk.po file
* commit uk.po file.

CVS is not very good at internal consistency, this kind of message
usually means your working copy is out of date relative to the server.

Richard


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Audacity-devel mailing list
Audacity-devel@...
https://lists.sourceforge.net/lists/listinfo/audacity-devel