[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: r42375 - trunk/packages/po



Quoting Damyan Ivanov (dam-guest@alioth.debian.org):
> Author: dam-guest
> Date: Mon Oct 30 23:50:51 2006
> New Revision: 42375
> 
> Modified:
>    trunk/packages/po/bg.po
> Log:
> More corrections to Bulgarian translation (l1). Still more to come, but this is useful to the point to be released as is

No, it is not that useful, I'm afraid:

You committed a file that contains SVN conflict markers. This probably
happened because you were working on the bg.po file but it got updated
by someone else (very likely the periodical synchronization
scripts). Then you tried "svn up" on the local copy you have and got
these conflict markers in the file (SVN did certainly mention you
about the conflict)....and you committed back the result, removing the
".mine" and ".r*" files.

I suggest not to proceed that way.

You should work outside your SVN checkout tree. Put your bg.po file in
a work directory. Update/complete it.

Then go back to you SVN checkout, run a "svn up" there.....and *then*
put your new bg.po file and *then* run a "svn commit".

Also, I found out that even when correcting these conflicts, the bg.po
file has 83 fuzzy strings. Is that intended?



I will correct the current bg.po file in the SVN so that it doesn't
break the sync scripts like it does currently. You should have found
this error by running:

msgfmt -o /dev/null -c --statistics bg.po

before committing it. Please always check your PO files this way
before committing them.



Attachment: signature.asc
Description: Digital signature


Reply to: