Hi,
When attempting to merge UTF-16 LE files that have merge conflicts, SVN inserts
junk characters, which I suspect are merge conflict notations in the wrong
encoding.
This can be surprisingly subtle when merging changes to Chinese language
resources. For example, this source snippet:
IDS_INTERNAL_INTERCOSTALS_ELECTRODE_PLACEMENT
"将两个电极放置在胸腔前外侧，与肋骨对齐。将上电极放置在腋窝下方。将下电极放置在其下方 1-2
指宽处。"
IDS_ULNAR_FINGER_FLEXORS_ELECTRODE_PLACEMENT
"将两个电极放置在前臂掌面尺侧区域。前臂自然下垂，将近端电极放置在肘前窝远端 1-2
指宽处。将第二个电极放置在第一个电极远端 1-2 指宽处。"
IDS_ULNAR_FINGER_EXTENSORS_ELECTRODE_PLACEMENT
"将两个电极放置在前臂背侧尺侧区域。前臂自然下垂，将近端电极放置在外侧髁远端约 3
指宽处。将第二个电极放置在第一个电极远端 1-2 指宽处。"
became this after merging:
IDS_INTERNAL_INTERCOSTALS_ELECTRODE_PLACEMENT
㰊㰼㰼㰼⸠潷歲湩൧ 䤀䐀匀开匀唀倀倀伀刀吀开䰀䤀一䬀开唀刀䰀 ∀栀琀琀瀀猀㨀⼀⼀爀琀椀⸀愀瀀瀀漀椀渀琀氀攀琀⸀挀漀洀∀ഀ
䤀䐀匀开匀吀䤀䴀唀䰀䄀吀伀刀开嘀䔀刀匀䤀伀一开䔀刀刀伀刀
∀ff㪖쁒桯䡖Ⱳᥧಋ尀爀尀渀춋ꖑ㕣遵赔핑ʋ舰余䱕Ƙ豣౾咋ﮀ剼吀氀≓ഀ籼籼籼⁼洮牥敧氭晥㕲㠵വ
䤀䐀匀开匀吀䤀䴀唀䰀䄀吀伀刀开嘀䔀刀匀䤀伀一开䔀刀刀伀刀 ∀ff㪖쁒桯䡖Ⱳᥧಋ尀爀尀渀춋ꖑ㕣遵赔핑ʋ舰余䱕Ƙ豣౾咋ﮀ剼吀氀≓ഀ㴽㴽㴽ഽ
∀⩎㕎腵㹧湥⡿咀䶁ᙒꝙ譎ꢀ連偛ʟذੜ㕎腵㹧湥⡿䭗鶁륎ɥذଡ଼㕎腵㹧湥⡿癗륎ⴀ㈀
܀뵣ћə∰ഀ㸾㸾㸾‾洮牥敧爭杩瑨爮㠵〲
IDS_ULNAR_FINGER_FLEXORS_ELECTRODE_PLACEMENT
㰊㰼㰼㰼⸠潷歲湩൧ 䤀䐀匀开匀唀倀倀伀刀吀开䰀䤀一䬀开吀䔀堀吀 ∀爀琀椀⸀愀瀀瀀漀椀渀琀氀攀琀⸀挀漀洀∀ഀ
䤀䐀匀开刀䔀匀䔀吀吀䤀一䜀开䌀伀一一䔀䌀吀䤀伀一 ∀─椀툀쵔溑≿ഀ籼籼籼⁼洮牥敧氭晥㕲㠵വ 䤀䐀匀开刀䔀匀䔀吀吀䤀一䜀开䌀伀一一䔀䌀吀䤀伀一
∀─椀툀쵔溑≿ഀ㴽㴽㴽ഽ
∀⩎㕎腵㹧湥⡿䵗쉒貁扣㪗Ꝝ㩏�ɗ䴰쉒㚁ୱ艎ۿ템㕺腵㹧湥⡿顗䶀鵒�⁺ⴀ㈀ ܀뵣ћəذⱜ豻⩎㕎腵㹧湥⡿ⱗ{⩎㕎腵�⁺ⴀ㈀
܀뵣ћə∰ഀ㸾㸾㸾‾洮牥敧爭杩瑨爮㠵〲
IDS_ULNAR_FINGER_EXTENSORS_ELECTRODE_PLACEMENT
"将两个电极放置在前臂背侧尺侧区域。前臂自然下垂，将近端电极放置在外侧髁远端约 3
指宽处。将第二个电极放置在第一个电极远端 1-2 指宽处。"
However, the first two resources are now corrupted.
Chris Guinnup
Restorative Therapies | Software Engineer
Our mission is to help people with neurological impairments or critical illness
achieve their full recovery potential.
We offer advanced training courses for your FES system. Hosted at our
Baltimore, MD Clinical Training Center these courses include, hands-on clinical
application and didactic learning across a broad indication of neurological
impairments. Courses are also eligible for CEU's. Read
more.<http://www.restorative-therapies.com/clinician-training>
PRIVILEGED AND CONFIDENTIAL: The information contained in this e-mail message
is intended only for the personal and confidential use of the recipient(s)
named above. If the reader of this message is not the intended recipient or an
agent responsible for delivering it to the intended recipient, you are hereby
notified that you have received this document in error and that any review,
dissemination, distribution, or copying of this message is strictly prohibited.
If you have received this communication in error, please notify us immediately
by e-mail, and delete the original message. Thank you.
