Thanks, I pushed it. On Mon, Jan 16, 2012 at 01:36:00AM +0900, しげっち wrote: > Hi, Martin. > > Sorry for sending incomplete patch set. > Attached ja.po.patch.gz file is the patch against the latest master > branch. Basically there's no difference for English text , but comment > lines that indicates the position of the text in the source code may > differ. > > Regards, > sigetch > > 2012年1月16日0:29 Martin Renold <[email protected]>: > > hi sigetch > > > > Sorry I must have missed it. > > > > The commits in this branch don't apply against master. The first commit > > seems to remove merge conflict markers that were never present in master. > > > > Could you please resolve the conflicts (if any) and provide a patch against > > master, or just the ja.po if there are no conflicts with master? > > > > Regards > > Martin > > > > On Sat, Jan 14, 2012 at 09:48:04PM +0900, しげっち wrote: > >> Hi, > >> > >> I've made Japanese translation after the release of MyPaint 1.0. > >> The patch is available at following git repo. > >> http://git.sourceforge.jp/view?p=mypaint-anime/master.git > >> > >> Two commits below patches the Japanese translation. > >> http://git.sourceforge.jp/view?p=mypaint-anime/master.git;a=commitdiff;h=56dfe7f3bd3a5f7d0501f751cebb4e9d39b92bed > >> and > >> http://git.sourceforge.jp/view?p=mypaint-anime/master.git;a=commitdiff;h=f9dec4f402df336834bfe71d1ab13aa8dd025673 > >> > >> I changed the word 'scratchpad' to 'working palette' in Japanese, > >> because scratchpad > >> is not common in Japan. > >> > >> Regards, > >> > >> sigetch > >> > >> 2012/1/14 Popolon <[email protected]>: > >> > Hi, > >> > > >> > I've translated some basic sentences of the software itself, at a time > >> > there > >> > was no japanese translation, but I don't have the level to translate > >> > everything. Are you interested to continue the translation of the > >> > software ? > >> > > >> > Olivier > >> > > >> > Le 14/01/2012 09:19, Takashi Miyagi a écrit : > >> > > >> >> Hi, > >> >> > >> >> I have translated the Basic usage Tutorial to Japanese and posted on > >> >> wiki. > >> >> http://wiki.mypaint.info/Documentation/Basic_usage_Tutorial_-_ja > >> >> > >> >> Could you add a link to this page from the original tutorial page? > >> >> > >> >> Regards, > >> >> > >> > > >> > > >> > _______________________________________________ > >> > Mypaint-discuss mailing list > >> > [email protected] > >> > https://mail.gna.org/listinfo/mypaint-discuss > >> > >> _______________________________________________ > >> Mypaint-discuss mailing list > >> [email protected] > >> https://mail.gna.org/listinfo/mypaint-discuss > >> > > > > -- > > Martin Renold
> _______________________________________________ > Mypaint-discuss mailing list > [email protected] > https://mail.gna.org/listinfo/mypaint-discuss -- Martin Renold _______________________________________________ Mypaint-discuss mailing list [email protected] https://mail.gna.org/listinfo/mypaint-discuss
