[Localization] msguniq conflict markers committed to act-server .po files

[C. Scott Ananian]

On Thu, Mar 6, 2008 at 5:07 PM, Alexander Dupuy <alex.dupuy at mac.com> wrote:
>  While this may be a reasonable approach, I wonder if there might be
>  complications in the process of merging your versions (with the conflict
>  markers) with the existing translations on Pootle (possibly exacerbated
>  by other, mostly cosmetic, changes to the msgid strings).  But Sayamindu
>  can probably address this issue best.
>
>  In any case, I'm cc'ing this to the localization list so that
>  translators for the various languages are alerted that when Pootle is
>  next updated from your act-server repository, there are likely to be
>  these conflict markers which will need cleanup.

I did update to the most recent versions from Pootle before I merged
in the django translations, and I uploaded the result directly to
Pootle.  The only languages which had existing Pootle content which
had to be merged were:
  bg de fr it nl ps pt
  --scott

-- 
                         ( http://cscott.net/ )