SiComponents Home Page SiComponents Forums
Here you will be able to get help and share your experience
 
 FAQFAQ   SearchSearch   MemberlistMemberlist   UsergroupsUsergroups   RegisterRegister 
 ProfileProfile   Log in to check your private messagesLog in to check your private messages   Log inLog in 

Merging of dfm files with different translation data

 
Post new topic   Reply to topic    SiComponents Forums Forum Index -> TsiLang Components Suite
View previous topic :: View next topic  
Author Message
sammyskim



Joined: 24 Oct 2019
Posts: 2

PostPosted: Thu Oct 24, 2019 7:57 am    Post subject: Merging of dfm files with different translation data Reply with quote

Hello,

I have the following problem. I have two files from the same base file, say file A and file AA. In file A I did some new translation and in file AA I developed some new features. When I now try to reintegrate / merge file A into file AA with Subversion, the translation data of file AA gets messed up.
I am not able to do an automated merge. I have to ignore the messed up translation data from file AA and copy the translation data block manually from A to AA and commit the changes.

My question now: Is there some best practices or another way to circumvent this situation?
The main problem is, that the translation data is not readable.
Can the storage of the translation data in the *.dfm files be turned off?

Thanks for your help.
Back to top
View user's profile Send private message
isiticov
Site Admin


Joined: 21 Nov 2002
Posts: 2160

PostPosted: Thu Oct 24, 2019 8:15 am    Post subject: Reply with quote

Hello,

The easiest way would be to save translation to external files and then merge them with SIL Editor. If you want to use the version controls merging then save to SIL (textual) file. And later load back to DFM after merging.
Back to top
View user's profile Send private message
isiticov
Site Admin


Joined: 21 Nov 2002
Posts: 2160

PostPosted: Thu Oct 24, 2019 8:17 am    Post subject: Reply with quote

isiticov wrote:
And later load back to DFM after merging.

Please note: you would need to perform this every time after merging if you store translations inside EXE(DFM).
Back to top
View user's profile Send private message
sammyskim



Joined: 24 Oct 2019
Posts: 2

PostPosted: Thu Oct 24, 2019 8:44 am    Post subject: Reply with quote

isiticov wrote:
Hello,

The easiest way would be to save translation to external files and then merge them with SIL Editor. If you want to use the version controls merging then save to SIL (textual) file. And later load back to DFM after merging.


That is what I am doing now. Export both versions of the project into a SIL file and merge it. After that I import the SIL file. But it is not very comfortable.

isiticov wrote:
Please note: you would need to perform this every time after merging if you store translations inside EXE(DFM).

Is there a way to not store the translations into the EXE(DFM)? I did not find a switch to do that. If that would be possible I would only use SIL file.
Back to top
View user's profile Send private message
isiticov
Site Admin


Joined: 21 Nov 2002
Posts: 2160

PostPosted: Thu Oct 24, 2019 9:26 am    Post subject: Reply with quote

There is no such switch currently. We will check how this could be improved.
Back to top
View user's profile Send private message
Display posts from previous:   
Post new topic   Reply to topic    SiComponents Forums Forum Index -> TsiLang Components Suite All times are GMT
Page 1 of 1

 
Jump to:  
You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum


Powered by p h p B B  © 2001, 2005 p h p B B  Group