Re: r57767 - trunk/packages/po/sublevel1
On Fri, Mar 06, 2009 at 06:24:44PM +0100, Christian Perrier wrote:
> Quoting Danishka Navin (danishka-guest@alioth.debian.org):
>
> > Modified: trunk/packages/po/sublevel1/si.po
> > ==============================================================================
> > --- trunk/packages/po/sublevel1/si.po (original)
> > +++ trunk/packages/po/sublevel1/si.po Fri Mar 6 10:46:30 2009
> > @@ -3066,14 +3066,8 @@
> > "existing data in the partition. Partitions that will be used in this way "
> > "are marked with \"${KEEP}\" in the main partitioning menu."
> > msgstr ""
> > -<<<<<<< .mine
> > "???? ??????? ????????? ?? ??? ??? ?? ???? ?????? ??? ???? ????? ???? ?????? ?????? ????? ???. ?? ?????? ?????? ?? ????? "
> > "??????? ????? ?????? \"${KEEP}\" ??? ????? ??? ??."
> > -=======
> > -"???? ??????? ????????? ?? ??? ??? ?? ???? ?????? ??? ???? ????? ???? ?????? ?????? "
> > -"????? ???. ?? ?????? ?????? ?? ????? ??????? ????? ?????? \"${??? ????}\" ??? ????? "
> > -"??? ??."
> > ->>>>>>> .r57765
> You apparently committed files with conflict markers....(the "<<<<<<<
> .mine" lines).
> That should be catched prior committing by running "msgfmt -o
> /dev/null -c si.po" which should detect the file as invalid...
Perhaps this should be run as a pre-commit hook in the svn repo, since we
can mechanically detect broken .po files and avoid committing them?
(http://wordaligned.org/articles/a-subversion-pre-commit-hook)
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
slangasek@ubuntu.com vorlon@debian.org
Reply to: