Could you please list the new entries to the language file?
Or some input on how to best merge the language files would be great, considering that both, the english and german language file are in lovely "red", showing merging errors all over ;)
So in my eyes the best would be keeping the old file and adding the new entries so I do not have to search for my modiifcations. As at least in the German file I can't anymore, as someone changed the file in B_2_1_7 too so that diffing is impossible ... (thanks?!)
I was quite amazed to see how much the German file seems to have changed *sighs*
Anyhow, another issue I face is with the merge of the template. the htm files were fairly easy as I could merge default template files with my own template file on 2_1_7. Though the style.css seems to give me a little headache. With 2.1.8 the text area for writing this seems to be like only 20 or 40 characters wide. So you can imagine something seems to be wrong with the old style.css. And yes, I dont feel like changing ALL color codes and thus... *sighs* so once more, this will be quite a big pain in the arse to validate on where the issue may be found ...
I dont know how to do it better, but oh well ... *sighs* ... time for me to sink into the merging hell again and get things done. It has to all be fixed in a few days *shivers*
Oh - as a hint to everyone with own layout:
Create a fresh template - as about ALL template files have changed. Then perform all your template changes to the fresh files again. That's HELL for those that did
alot of changes too ;) ^^
Happy merging ^^
[originally posted on jforum.net by Sid]
