Re: [mantisbt-dev] commit d679a60b: Revert + Update Language file format

[Damien R. <dr...@ma...>]

On 2013-10-10 10:00, Damien Regad wrote:
> OK fair enough, let's drop the API changes too - I just wanted to be
> as conservative as possible in my changes.

I applied the changes to lang_api.php from your commit on top of the 
merged master branch (not pushed yet as I write this)

> But you have not answered my questions
> - How did you go about that ? 3-way merge ?
> - And what was the rationale for updating all language files ?

Paul,

As you have not responded to my points above, I did a 3-way compare of 
lang/strings_english.txt between 1.2.x, commit d679a60b and my 13x branch.

It turns out the only differences between 1.2.x and 13x are
- the file header
- the phpdoc block
- extra, modified and deprecated strings related to commits in master 
branch (as expected)
- one missing tweak to s_configuration_corrupted
- Comments for specific strings
- whitespace

Likewise there are virtually no differences between your updated file 
and the master branch one; in fact you even removed a few strings which 
should be there (I would assume that your reference file was a bit 
outdated).

Based on the above, I'll add some commits to update the file headers and 
add back the missing comments.

AFAIK, there is no need to manually update the other language files 
(i.e. the translations themselves) as TranslateWiki would handle this 
automatically when we switch from 1.2.x to master, so I'll leave that out.

As a side note, does anyone know what why we have a non-phpDoc tag 
'@ingroup' in the language files header?  Based on the commit comment 
(by Siebrand), it's doxygen [1].

D

[1] http://www.doxygen.org/manual/commands.html#cmdingroup