Issue 18586 - merging of the translations to bad place
Summary: merging of the translations to bad place
Status: CLOSED FIXED
Alias: None
Product: Internationalization
Classification: Code
Component: code (show other issues)
Version: OOo 1.1 RC3
Hardware: PC Linux, all
: P3 Trivial (vote)
Target Milestone: ---
Assignee: ivo.hinkelmann
QA Contact: issues@l10n
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-08-24 19:40 UTC by pavel
Modified: 2003-08-26 16:40 UTC (History)
1 user (show)

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

Attachments
Move the translations where they belong (2.07 KB, patch)
2003-08-24 19:42 UTC, pavel 		no flags Details | Diff
FIx badly merged translations after merge (373 bytes, patch)
2003-08-24 19:42 UTC, pavel 		no flags Details | Diff
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this issue.
Description pavel 2003-08-24 19:40:39 UTC 
Hi,

the translations in ooo_11rc4_src/sw/source/ui/inc/swmn.hrc are merged in a way
that prevents merging the translations again. I need to apply
OOo_11rc4_source-bad_merge.diff (attached) to be able to merge. Without this
patch, one needs to apply OOo_11rc4-czech-localize-bugs.diff (attached) to be
able to compile.
Comment 1 pavel 2003-08-24 19:41:26 UTC 
fixed the Summary
Comment 2 pavel 2003-08-24 19:42:20 UTC 
Created attachment 8701 [details]
Move the translations where they belong
Comment 3 pavel 2003-08-24 19:42:54 UTC 
Created attachment 8702 [details]
FIx badly merged translations after merge
Comment 4 ivo.hinkelmann 2003-08-26 11:46:44 UTC 
I've applied your patch "OOo_11rc4-czech-localize-bugs.diff" on the
master.
Comment 5 ivo.hinkelmann 2003-08-26 11:47:54 UTC 
ups , I mean "2003-08-24 11:42 PDT: OOo_11rc4_source-bad_merge.diff"
Comment 6 pavel 2003-08-26 16:40:17 UTC 
Thank you!