[ http://issues.apache.org/jira/browse/OFBIZ-157?page=comments#action_12430439 ] Jacques Le Roux commented on OFBIZ-157: ---------------------------------------
Rodrigo, I'm not sure of what you mean when you say "next patch could be apply after translation_es_v2 only, and discard the translation_es.patch file. ". As I explained above I applied these patches one after the other resolving conflicts. They are in OFBiz since rev 434047. After that I noticed that something went wrong during resolution of conflicts and that the 3 files above were missing (actually they were badly merged by Tortoise, I had to manually clean them a little). These 3 files are now in OFBiz since rev 434410. Please update your working copy (or check out a special working copy if needed) from svn so that we work on the same trunk. Something to be said : when I manuallly resolved the conflicts I noticed that these was mostly about headers and blank lines. So I repeatedly choose an option in Tortoise "Apply patch" that's let you use one whole file to resolve conflicts. So actually the files that were commited in rev 434047 were mostly complete files from translation_es_v2.patch. Hope it's clear Thanks > Accounting Component Translation (Spanish) > ------------------------------------------ > > Key: OFBIZ-157 > URL: http://issues.apache.org/jira/browse/OFBIZ-157 > Project: OFBiz (The Open for Business Project) > Issue Type: Improvement > Components: accounting > Reporter: Victor Hugo Hernandez Posadas > Assigned To: Jacques Le Roux > Priority: Minor > Fix For: SVN trunk > > Attachments: AccountingUiLabels_es.properties, translation_es.patch, > translation_es_v2.patch, translations.zip > > > I'm doing the translation of the Accounting component, I've not yet finished > but here's an advance in the attached file, I'll thank if someone can to > include it to the OFBiz SVN Tree, any observations will be valuated. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira
