[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: .po tools [was: Re: Soft call for translating the Release Notes]



On Fri, 3 May 2013 00:25:44 +0300
Andrei POPESCU wrote:

> Could you please help me with the magic incantations to be able to merge 
> my locally changed file with the SVN refreshed ones? I'm sure there must 
> be a better method than manually solving all VCS conflicts or manually 
> merging my changes with vimdiff.

always conflict somewhere when I update updated files :(
maybe update clean copy, then porting translated strings will be better...
as I use text editor :p


-- 
victory
no need to CC me :-)
http://userscripts.org/scripts/show/102724 0.0.1.4
http://userscripts.org/scripts/show/163846 0.0.1
http://userscripts.org/scripts/show/163848 0.0.1


Reply to: