Ok, let's take a deep breathe and sort things out here...shivu wrote:Live is hard!
I don't think that Dilvish wanted to imply that. I'm more inclined to believe he's merely been asking some questions to clarify how exactly we should proceed concerning the two conflicting german stringtable files.1. I am not responsible for the actual state of two German files.
Perfectly reasonable. I don't think anyone objects to this decision.2. When I begin to translate I use the most actual file, seems to be logic. That was ger_stringtable.txt.
Agreed. I understand and share that sentiment.3. That a second German file was always a “Dorn im Auge” to me. Sry I cannot translate this expression, but it means more or less “I don’t like it”.
BTW, the translation that probably comes closest to the german phrase of "Dorn im Auge" would be "thorn in my side"
Well, looks like we don't have universal agreement on this one, as adrians answer seems to imply. And judging by one of your replies above with regard to this problem I got the impression that altough you think most of the entries in the old de.txt file are outdated, you've at least kept copies of some of them to use them once you get to translate the respective entries. I'll try to address that, see below.5. The de_ file does not contain anything that could be useful to me. All entries are very old and no more up-to-date.
I understand that you're probably a bit annoyed because you feel the need to repeat yourself. Please have patience, I'll try to sort things out. After all, Adrian has offered to help by taking it upon himself to do the merging, why not let him assist you with what's probably an annoying task.
Point taken! I've renamed the old de.txt to de_old.txt (as Dilvish suggested), renamed ger.txt to de.txt and committed your last changes. I want to keep de_old.txt around until we've merged anything from there into de.txt we might want to preserve (if there is anything at all we want to preserve). With now having de.txt and de_old.txt I think there sould be no more confusion about which of the files is the actual and current german stringtable file.6. And finally, I have no access to the repository. I can just ask, pls, pls...
I've queried the svn metadata on these files. Going by that info, ger.txt (formerly ger_stringtable.txt) is the original german stringtable file. With commit#3549, de_stringtable.txt has been added, apparently an alternate, complete (at that time) translation by Lathanda (see commit log). After that there have been only a few updates to ger_stringtable.txt and de_stringtable.txt committed. Some of these updates have been applied to both files, and some (including the most recent) only to ger_stringtable.txt. So using ger_stringtable.txt/ger.txt to work with has definitely been the right decision.adrian_broher wrote:There are a lot of entries in de.txt that are good to use, translate the english entry properly and are not part of ger.txt.
The question is, which are these entries in de.txt (now de_old.txt) you're referring to? If these are translations of old, leftover entries in the english stringtable that aren't used anymore (and I got the impression that's not only just a few), or translation of entries that have been changed afterwards, there's probably no need to merge them into the new de.txt.
Moreover, shivu has already explained that he has retained copies of at least some entries of the old de.txt to use them once he gets to translate the respective sections. So apparently he intends to merge what's still useful. That said, I see no reason why not to take up your offer to help with that. It should be possible for shivu and you to coordinate your efforts.