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...
Attachment:
signature.asc
Description: Digital signature