On Saturday 25 May 2013 10:45:20 Masayuki Hatta wrote: > Hi, > > I'd like to resume my Japanese translation work for Freenet (after 2 years > hiatus ;-), please find attached an updated Japanese translation. > > BTW, I have two questions: > > 0) fred-staging/src/freenet/l10n/freenet.l10n.ja.properties contains "End" > in the middle of it, the line 222. I guess the contents of that file after > that are ignored. This might be the reason why most of existing Japanese > translation messages don't show up at all for the time being. Is this > intentional? If so, could you tell me how to fix them? Maybe I can merge > them to the current one. > ** > > 1) In future, I'd like to do pull request on Github for updating the > translation file. I guess I need to prepare freenet.l10n.ja.properties, > not freenet.l10n.ja.*override*.properties. Is there any handy way to merge > override to the main properties?
There is a command line merge tool included in Freenet. If you are running from a jar you'll need to replace the bit after -cp below to be the filename of your freenet.jar and freenet-ext.jar. (On Windows, paths are separated by ";", but on linux and mac it's ":"). This is what I used to do (before recent changes) java -cp build/main/:lib/freenet/freenet-ext.jar freenet.tools.MergeSFS src/freenet/l10n/freenet.l10n.ja.properties ~toad/freenet.l10n.ja.override.properties > 1 cp 1 src/freenet/l10n/freenet.l10n.ja.properties GIT_AUTHOR_NAME="Masayuki Hatta" GIT_AUTHOR_EMAIL="[email protected]" git commit src/freenet/l10n/freenet.l10n.ja.properties This is what I do now (since recent changes, this is only in the next branch but may be in a future build): java -cp build/main/:lib/freenet/freenet-ext.jar freenet.tools.MergeSFS src/freenet/l10n/freenet.l10n.ja.properties ~toad/freenet.l10n.ja.override.properties GIT_AUTHOR_NAME="Masayuki Hatta" GIT_AUTHOR_EMAIL="[email protected]" git commit src/freenet/l10n/freenet.l10n.ja.properties Of course your other option is just to edit freenet.l10n.ja.properties directly. You don't need to use the translation toadlet. I'm sure you know that the english diffs are posted here: https://emu.freenetproject.org/l10n/
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Devl mailing list [email protected] https://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl
