Well. I've finally merged the full thing. I've updated languages/es-ES with all the new and updated strings, and the plugin is now available for checking and merging. I can do minor corrections as I test the translation in situ, while working on the spanish edition, but it should not suffer major amendments.
I now have to put some order in git. I got advised to make an early PR and then push commits, so Jeremy could check them easier, but I think I should better cancel the current PR, as plugin translation has miserably mixed with the edition. I should then make a first PR for the plugin and another one once the spanish edition is finished. I'll check your instructions and try to follow them in future upgrades. Danke for all help!! P-) El lunes, 25 de abril de 2016, 13:51:46 (UTC+2), PMario escribió: > > On Monday, April 25, 2016 at 11:52:53 AM UTC+2, Pau Deluca wrote: >> >> have fun! >>> >> >> Lol! >> > > If it helps !:) > > I can describe the workflow I'm using. ... It's still manual work heavy, > but imo less frustrating as comparing different tw.html files and the > nodejs version. > > As I said: I'm using a git branch only approach. > > > - first I have a look at my own language directory: eg: de-DE > <https://github.com/pmario/TiddlyWiki5/tree/master/languages/de-DE> > and it's history: de-DE history button top right > <https://github.com/pmario/TiddlyWiki5/commits/master/languages/de-DE> > > - So I can see my last commi. At the time of writing it is: Feb 7, > 2016 > - Then I go to Jeremy's core language rep > <https://github.com/Jermolene/TiddlyWiki5/tree/master/core/language/en-GB> > > and open the history there. ( Apr 22, 2016 ) > > > <https://github.com/Jermolene/TiddlyWiki5/commits/master/core/language/en-GB> > > > - I scroll down to the last commit that is __junger__ than my last one > - I open very commit from Jeremy and see, which language files have > been changed. > - Doing commit by commit is also easier to test. > > > - I open the local copy of my tw master branch and do git pull > jermolene master > - I create a new branch from it with git checkout -b de-DE > - I make my changes and additions to de-DE branch and create a PR from > there > - One commit at a time > - testing > - If Jeremy adds new stuff in the core I push to de-DE as long as > it is not merged. > > > - If it is merged I start over from the beginning > > > - From time to time I check if all .multids files in my language > directories have *the same number of lines* as the .multids files in > the core. Just to be sure :) > > have fun! > mario > -- You received this message because you are subscribed to the Google Groups "TiddlyWiki" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/tiddlywiki. To view this discussion on the web visit https://groups.google.com/d/msgid/tiddlywiki/31307079-b78e-4b4f-94e0-31603aa653f7%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
