Re: Russian Translation

I guess there are conflicted files. If you updated a file to edit, and 
someone commited before you comit, you get these errors. You can see 
which file has conflict by doing "ls -a" in the directory. The files 
like ".#doc.html.en.1.33" are the revision you last updated. To solve 
the problems needs some care, but if you know no one has touched the 
russian files, just remove all the files in the directory first, copy 
the files into there, then commit them.



On 2005/01/16, at 19:05, Jeff Horsager wrote:

> Hi,
>
> Some further Russian translations were completed, but I got the 
> following errors when trying to check the translated faq files in.  
> Any ideas?
>
> -------------------------------------------------------------
>
> [email protected]'s password:
> ? x11/x11.ru.xml
> ? web/faq/usage-packages.ru.php
> ? web/faq/upgrade-fink.ru.php
> ? web/doc/cvsaccess/index.ru.php
> ? web/doc/cvsaccess/cvs.ru.html
> ? web/doc/index.ru.php
> ? web/doc/doc.ru.html
> ? users-guide/uguide.ru.xml
> ? security/sec-policy.ru.xml
> ? scripts/installer/dmg/doc/cvsaccess/cvs.ru.html
> ? scripts/installer/dmg/doc/doc.ru.html
> ? netiquette/netiquette.ru.xml
> ? fink-readme/readme.ru.xml
> ? .DS_Store
> cvs commit: Up-to-date check failed for 
> `scripts/installer/dmg/doc/doc.en.html'
> cvs commit: Up-to-date check failed for 
> `scripts/installer/dmg/doc/doc.es.html'
> cvs commit: Up-to-date check failed for 
> `scripts/installer/dmg/doc/doc.fr.html'
> cvs commit: Up-to-date check failed for 
> `scripts/installer/dmg/doc/doc.ja.html'
> cvs commit: Up-to-date check failed for 
> `scripts/installer/dmg/doc/doc.zh.html'
> cvs commit: Up-to-date check failed for 
> `scripts/installer/dmg/doc/cvsaccess/cvs.en.html'
> cvs commit: Up-to-date check failed for 
> `scripts/installer/dmg/doc/cvsaccess/cvs.es.html'
> cvs commit: Up-to-date check failed for 
> `scripts/installer/dmg/doc/cvsaccess/cvs.fr.html'
> cvs commit: Up-to-date check failed for 
> `scripts/installer/dmg/doc/cvsaccess/cvs.zh.html'
> cvs commit: Up-to-date check failed for 
> `scripts/installer/dmg/faq/faq.en.html'
> cvs commit: Up-to-date check failed for 
> `scripts/installer/dmg/faq/faq.es.html'
> cvs commit: Up-to-date check failed for 
> `scripts/installer/dmg/faq/faq.fr.html'
> cvs commit: Up-to-date check failed for 
> `scripts/installer/dmg/faq/faq.ja.html'
> cvs commit: Up-to-date check failed for 
> `scripts/installer/dmg/faq/faq.zh.html'
> Checking /cvsroot/fink/scripts/installer/dmg/faq...
> Checking faq.ru.html...
> cvs commit: Up-to-date check failed for `web/doc/doc.en.html'
> cvs commit: Up-to-date check failed for `web/doc/doc.es.html'
> cvs commit: Up-to-date check failed for `web/doc/doc.fr.html'
> cvs commit: Up-to-date check failed for `web/doc/doc.ja.html'
> cvs commit: Up-to-date check failed for `web/doc/doc.zh.html'
> cvs commit: Up-to-date check failed for `web/doc/index.zh.php'
> cvs commit: Up-to-date check failed for `web/doc/cvsaccess/cvs.en.html'
> cvs commit: Up-to-date check failed for `web/doc/cvsaccess/cvs.es.html'
> cvs commit: Up-to-date check failed for `web/doc/cvsaccess/cvs.fr.html'
> cvs commit: Up-to-date check failed for `web/doc/cvsaccess/cvs.zh.html'
> cvs commit: Up-to-date check failed for `web/faq/comp-general.ja.php'
> cvs commit: Up-to-date check failed for `web/faq/comp-packages.ja.php'
> cvs commit: Up-to-date check failed for `web/faq/faq.en.html'
> cvs commit: Up-to-date check failed for `web/faq/faq.es.html'
> cvs commit: Up-to-date check failed for `web/faq/faq.fr.html'
> cvs commit: Up-to-date check failed for `web/faq/faq.ja.html'
> cvs commit: Up-to-date check failed for `web/faq/faq.zh.html'
> cvs commit: Up-to-date check failed for `web/faq/general.ja.php'
> cvs commit: Up-to-date check failed for `web/faq/index.ja.php'
> cvs commit: Up-to-date check failed for `web/faq/mirrors.ja.php'
> cvs commit: Up-to-date check failed for `web/faq/relations.ja.php'
> cvs commit: Up-to-date check failed for `web/faq/upgrade-fink.ja.php'
> cvs commit: Up-to-date check failed for `web/faq/usage-fink.ja.php'
> cvs commit: Up-to-date check failed for `web/faq/usage-general.ja.php'
> cvs commit: Up-to-date check failed for `web/faq/usage-packages.ja.php'
> Checking /cvsroot/fink/web/faq...
> Checking comp-general.ru.php...
> Checking comp-packages.ru.php...
> Checking faq.ru.html...
> Checking general.ru.php...
> Checking header.ru.inc...
> Checking index.ru.php...
> Checking mirrors.ru.php...
> Checking relations.ru.php...
> Checking usage-fink.ru.php...
> Checking usage-general.ru.php...
> cvs [commit aborted]: correct above errors first!
> powerbook:~/Sites/xml horsager$
--
BABA Yoshihiko

"You can take my freedom but you can't take my beer!!" by aarkzoo

Town Planner (Kyoto Center for Community Collaboration)
Support, Translation and Documentation Team, Fink Project 
(http://fink.sourceforge.net)



-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt