[Tux4kids-tuxtype-dev] po/ conflicts

[Brendan Luchen]

>> I wasn't aware of any issues with po or gmo files in tuxtype.
>
> I wish I'd paid closer attention to the complaints I got...most
> recently (though not actually merge-related) make complained about a
> missing zh_CN.po that's listed in LINGUAS but not present in po/ so I
> just deleted the line in LINGUAS from my working copy.

FWIW, I discovered the other issue I was having is likely a
TortoiseGit bug. Basically it wasn't letting me branch or merge on
Windows unless I used --force because of "local changes" to some of
the .po files that were really just being read as CRLF.

-Brendan