[tw] Re: Language plugin es-ES 5.1.12 Prerelease translated -HELP NEEDED-

2016-04-25 Thread Pau Deluca 
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 
> 
>and it's history:  de-DE history button top right 
>  
>
>- 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 
> 
>  
>and open the history there. ( Apr 22, 2016 )
>
>
> 
>
>
>- 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 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/31307079-b78e-4b4f-94e0-31603aa653f7%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[tw] Re: Language plugin es-ES 5.1.12 Prerelease translated -HELP NEEDED-

2016-04-25 Thread PMario 
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 
    and 
   it's history:  de-DE history button top right 
     
   - 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 
     
   and open the history there. ( Apr 22, 2016 )
   
   


   - 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. 


   - 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
   - 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 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/1d660b75-9290-43a7-bacf-51dfe7b49d2e%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[tw] Re: Language plugin es-ES 5.1.12 Prerelease translated -HELP NEEDED-

2016-04-25 Thread Pau Deluca 


> I'm sure, you just want to highlight the above statement. .. but it 
> actually means that you are shouting 
> ;)  
>

I was, actually! Yelling and sobbing of pure despair sigh! Not having 
someone else to put the blame on is quite frustrating... 
 
I'm now comparing both folders and merging by hand file by file, line by 
line. I'ts tedious and time-consuming, but definitely accurate. I will then 
have an updated and shiny new es-ES folder to push into languages that will 
fit the new version.

have fun!
>
 
Lol!

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/305d35e9-67af-4a74-acfe-d9880c3376bd%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[tw] Re: Language plugin es-ES 5.1.12 Prerelease translated -HELP NEEDED-

2016-04-25 Thread PMario 
On Monday, April 25, 2016 at 9:35:12 AM UTC+2, Pau Deluca wrote:
>
> 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'm sure, you just want to highlight the above statement. .. but it 
actually means that you are shouting 
;) 
 

> 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.
>

Yea, that's a problem, all translators have. Keeping track can be a bit 
overwhelming. 

but

IMO the best way is to use your github branch only, for incremental 
updates. We don't have a good way to sync with the translators edition, if 
there are pending pull requests, that are not merged yet. 
So the best way is to just push to the pending PR on github. Github will 
add them as long as the PR is not merged. If Jeremy merges the stuff and 
publishes new translators edition everything is in sync again. 

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 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/43f9d4df-8470-465d-9c67-76c9a8665119%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[tw] Re: Language plugin es-ES 5.1.12 Prerelease translated -HELP NEEDED-

2016-04-25 Thread Pau Deluca 
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.