Issue 16007 - #pragma renders merging unusable
Summary: #pragma renders merging unusable
Status: CLOSED FIXED
Alias: None
Product: Internationalization
Classification: Code
Component: code (show other issues)
Version: OOo 1.1 RC
Hardware: All All
: P2 Trivial (vote)
Target Milestone: ---
Assignee: nils.fuhrmann
QA Contact: issues@l10n
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-06-24 13:54 UTC by pavel
Modified: 2013-08-07 15:02 UTC (History)
2 users (show)

See Also:
Issue Type: DEFECT
Latest Confirmation in: ---
Developer Difficulty: ---


Attachments

Note You need to log in before you can comment on or make changes to this issue.
Description pavel 2003-06-24 13:54:15 UTC
Hi,

those files:

svx/source/dialog/test.src
offmgr/source/offapp/intro/rtc.src

contains #pragmas:

pavel@pavel:~/Tmp/ooo_11rc_src> grep ^#pragma svx/source/dialog/test.src
offmgr/source/offapp/intro/rtc.src
svx/source/dialog/test.src:#pragma CHARSET_IBMPC
offmgr/source/offapp/intro/rtc.src:#pragma CHARSET IBMPC

This is connected with badly merge Czech and Slovak translations there, e.g.:

	GroupBox GRP_POSITION

is completely bad. It should read Umisteni (both i with accute, e with hook over
it). All those letters with diacritical marks are saved as six bytes there.
When I tried to remove those #pragmas, it was merged correctly.

This happens with almost all languages newly merged.

What is the purpose of that #pragma there?
Comment 1 nils.fuhrmann 2003-06-26 16:42:36 UTC
#pragma CHARSET indicates a dedicated encoding for the full src file.
This leads to the mixed up encodings within the strings.
I have removed the #pragma => FIXED
Comment 2 nils.fuhrmann 2003-06-26 16:43:14 UTC
Available on head
Comment 3 pavel 2003-06-26 17:19:04 UTC
Could you please join it to 11rc too?
Comment 4 pavel 2003-06-29 07:57:14 UTC
Please commit that to 11rc and also re-merge all languages to those
files. Without re-merge, there will be bad strings.
Comment 5 nils.fuhrmann 2003-07-01 13:01:12 UTC
The affected files will not be integrated in any product, so this will
not be fixed.
Comment 6 pavel 2003-07-01 13:24:03 UTC
OK.

Closing.
Comment 7 pavel 2003-07-06 21:00:12 UTC
I fixed it in svx/source/dialog/test.src in 1.1 RC2 tree, the other
file is already fixed there.
Comment 8 pavel 2003-08-07 16:36:32 UTC
Those pragmas are again in RC3:

svx/source/dialog/test.src
offmgr/source/offapp/intro/rtc.src

Almost all strings in those files are not correct. It was already
fixed in RC2 but got lost when merging. Martin?
Comment 9 Martin Hollmichel 2003-08-07 17:29:06 UTC
committed to rc3.
Comment 10 pavel 2003-08-07 17:57:26 UTC
Thanks!