Sorry, Eric, but the patches did not go in. All of the hunks failed. This is strange because there should have been no changes since your last contribution. Do you have an updated one?
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
Logged In: YES
user_id=908761
Originator: NO
Sorry, Eric, but the patches did not go in. All of the hunks failed. This is strange because there should have been no changes since your last contribution. Do you have an updated one?
Logged In: YES
user_id=1808441
Originator: YES
Hmmm...
I tried to re-apply my patches on reverted versions, and they worked fine.
Besides one of the three contributed files is a new file.
Can you give me more details about the failures? Maybe an EOL issue?
(Using TortoiseSVN on Windows XP - EOL = "native")
Logged In: YES
user_id=908761
Originator: NO
Eric, basically all the hunks failed:
patch -p 0 < ~/Desktop/CRMSFA_fr.properties/CRMSFAUiLabels_fr.properties.patch
(Stripping trailing CRs from patch.)
patching file CRMSFAUiLabels_fr.properties
Hunk #1 FAILED at 16.
Hunk #2 FAILED at 36.
Hunk #3 FAILED at 44.
Hunk #4 FAILED at 52.
Hunk #5 FAILED at 70.
Hunk #6 FAILED at 93.
Hunk #7 FAILED at 107.
Hunk #8 FAILED at 176.
Hunk #9 FAILED at 225.
Hunk #10 FAILED at 257.
Hunk #11 FAILED at 288.
Hunk #12 FAILED at 322.
Hunk #13 FAILED at 355.
Hunk #14 FAILED at 378.
Hunk #15 FAILED at 395.
Hunk #16 FAILED at 434.
16 out of 16 hunks FAILED -- saving rejects to file CRMSFAUiLabels_fr.properties.rej
I have committed the entity labels. Why don't you just upload a zip file of the error labels and ui labels?
Logged In: YES
user_id=1808441
Originator: YES
OK. Here they are
File Added: CRMSFA.zip
Logged In: YES
user_id=908761
Originator: NO
Merci beaucoup!