EN Translation Patch 3

Lin

Today's English translation patch. Working down according to the file order listed here and sometimes member pages too.

Currently on /upload/source/language/lang_admincp.php
NOT fully modified. It is a BIG file {:2_25:} Currently on line 5xx.



NOTE: Need to update this. Please do not download >.< Will be updated tomorrow with proper files.

vot

This time your patch structure is totally ok!

But there is yet another problem

Your previous patch was allready applied to the repository as revision 74.

It is strongly recommended to make "SVN Update" before making a patch!

Elsewhere some code conflicts may occure.

My offer: try to update your working copy to rev.74 and then re-make your patch.

vot

Now reviewing the patch suggestions...

vot

After SVN update, is it okay to just copy/paste over the edited form?

What the form?
Just make the same patch again! (It will not contain allready applied modifications)

Or do I need to make the changes line by line again?

No, you DO NOT need to re-do any job again!
SVN will make a new patch with only NEW changes made after the latest revision.

Lin

Hm... I am not quite sure if I am doing this correctly.

So I used the "SVN Update" option. Now I am seeing files such as:
lang_template.php.mine
lang_template.php.r73
lang_template.php.r81

Should I just redo the whole package? x.x OR is it normal that I see those files?

vot

In a normal case no additional files created!
Seems, you have a code conflict.

In this situation  you have to combine the lang_template.php.r81 and lang_template.php.mine.
Compare this files, copy your new modifications from .mine to .81.
Then save .81 as lang_template.php,
and remove obsolete files: .mine, .73, .81

After this make a patch.

vot

Lin, I have prepared a short instruction about file merging:
http://codersclub.org/discuzx/fo ... &extra=page%3D1