I'm trying to solve it by manually comparing and merging both folders file by file. I hope it works.
El lunes, 25 de abril de 2016, 9:35:12 (UTC+2), Pau Deluca escribió: > > Hi there! > > I've translated the newly added strings to es-ES language plugin 5.1.12 > prerelease. > > I have a little problem here that I need to sort out. It's not the first > time I get something like this, but I'm unsure how to cope with it. > > > - I have previously translated a set of strings, contained in a now > outdated 5.1.12-pre translators file. These strings fix typos as well as > terminological inconsistences of the spanish language plugin. They can be > found: > > > - As the outdated 5.1.12-pre translators edition HTML-file here: > > https://dl.dropboxusercontent.com/u/885342/Translation_ES-es_5.1.12-prerelease.html > - As a folder, in languages/es-ES, in my github branch > translation_es-ES, waiting for the spanish edition to be finished to be > pulled, as I'm continuously testing and correcting them. > - As the extracted folder es-ES1, at > > https://www.dropbox.com/sh/f69ft5smmj0tekm/AACb6TojYzbQlUVUC11KLZv6a?dl=0 > - I have translated this morning the newly added strings in a now > updated 5.1.12-pre translators file. ALL THE STRINGS IN THIS FILE EXCEPT > THE NEWLY ADDED ARE OUTDATED, as the file loads current version es-ES > string values, that should be changed by those I have pending submission. > All these strings can be found: > - As the updated 5.1.12-pre translators edition HTML-file here: > > https://dl.dropboxusercontent.com/u/885342/Translation_ES-es_5.1.12-prerelease-updated.html > - As the extracted folder es-ES2, at > > https://www.dropbox.com/sh/f69ft5smmj0tekm/AACb6TojYzbQlUVUC11KLZv6a?dl=0 > > My question now is: > > > HOW DO I MERGE BOTH, SO THE UPDATED STRINGS CONTAINED IN THE OUTDATED FILE > REPLACE THE OUTDATED STRINGS IN THE UPDATED FILE WHILE KEEPING THE NEWLY > ADDED? > > I have unsuccessfully tried a couple of things in node, but I don't want > to cause any mess I can't handle in the repository while I'm still pushing > commits to the spanish edition. > > Thank you! > > P.-) > > > -- 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 tiddlywiki+unsubscr...@googlegroups.com. To post to this group, send email to tiddlywiki@googlegroups.com. 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/e7663120-ee3c-47cf-8cb9-c0ca8a04643d%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
