diff -urN oo_cvs_2004-01-01/config_office/set_soenv.in oo_welsh/config_office/set_soenv.in --- oo_cvs_2004-01-01/config_office/set_soenv.in 2003-12-17 15:01:33.000000000 +0000 +++ oo_welsh/config_office/set_soenv.in 2004-01-02 10:02:42.000000000 +0000 @@ -50,7 +50,7 @@ # # Platform independent constant values. my @LANGUAGES = ("ARAB", "CAT", "CHINSIM", "CHINTRAD", "CZECH", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "HUNG", "ITAL", -"JAPN", "KOREAN", "POL", "PORT", "PORTBR", "RUSS", "SLOVAK", "SLOVENIAN", "SPAN", "SWED", "TURK", "FINN", "ESTONIAN" ); +"JAPN", "KOREAN", "POL", "PORT", "PORTBR", "RUSS", "SLOVAK", "SLOVENIAN", "SPAN", "SWED", "TURK", "FINN", "ESTONIAN", "WELSH" ); my @DICTIONARIES = ("DADK", "DEDE", "ENGB", "ENUS", "ITIT", "RURU" ); my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PRODUCT, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, diff -urN oo_cvs_2004-01-01/framework/source/services/substitutepathvars.cxx oo_welsh/framework/source/services/substitutepathvars.cxx --- oo_cvs_2004-01-01/framework/source/services/substitutepathvars.cxx 2003-12-17 18:38:15.000000000 +0000 +++ oo_welsh/framework/source/services/substitutepathvars.cxx 2004-01-02 10:05:25.000000000 +0000 @@ -182,6 +182,7 @@ #define REPLACEMENT_RUSSIAN ASCII_STR("russian") #define REPLACEMENT_SLOVAK ASCII_STR("slovak") #define REPLACEMENT_SLOVENIAN ASCII_STR("slovenian") +#define REPLACEMENT_WELSH ASCII_STR("welsh") #define REPLACEMENT_SPANISH ASCII_STR("spanish") #define REPLACEMENT_SWEDISH ASCII_STR("swedish") #define REPLACEMENT_TURKISH ASCII_STR("turkish") @@ -980,6 +981,8 @@ break ; case LANGUAGE_SLOVENIAN : aLangStr = REPLACEMENT_SLOVENIAN; break ; + case LANGUAGE_WELSH : aLangStr = REPLACEMENT_WELSH; + break ; case LANGUAGE_SPANISH : case LANGUAGE_SPANISH_MEXICAN : diff -urN oo_cvs_2004-01-01/offmgr/source/offapp/app/app.src oo_welsh/offmgr/source/offapp/app/app.src --- oo_cvs_2004-01-01/offmgr/source/offapp/app/app.src 2003-12-17 15:46:00.000000000 +0000 +++ oo_welsh/offmgr/source/offapp/app/app.src 2004-01-02 10:08:58.000000000 +0000 @@ -959,6 +959,7 @@ File [ slovak ] = "sc_out43.bmp"; File [ hungarian ] = "sc_out36.bmp"; File [ slovenian ] = "sc_out50.bmp"; + File [ welsh ] = "sc_out53.bmp"; File [ catalan ] = "sc_out37.bmp"; }; @@ -994,6 +995,7 @@ File [ slovak ] = "lc_out43.bmp"; File [ hungarian ] = "lc_out36.bmp"; File [ slovenian ] = "lc_out50.bmp"; + File [ welsh ] = "lc_out53.bmp"; File [ catalan ] = "lc_out37.bmp"; }; @@ -1029,6 +1031,7 @@ File [ slovak ] = "sc_off43.bmp"; File [ hungarian ] = "sc_off36.bmp"; File [ slovenian ] = "sc_off50.bmp"; + File [ welsh ] = "sc_off53.bmp"; File [ catalan ] = "sc_off37.bmp"; }; @@ -1064,6 +1067,7 @@ File [ slovak ] = "lc_off43.bmp"; File [ hungarian ] = "lc_off36.bmp"; File [ slovenian ] = "lc_off50.bmp"; + File [ welsh ] = "lc_off53.bmp"; File [ catalan ] = "lc_off37.bmp"; }; @@ -1100,6 +1104,7 @@ File [ hungarian ] = "schout36.bmp"; File [ catalan ] = "schout37.bmp"; File [ slovenian ] = "schout50.bmp"; + File [ welsh ] = "schout53.bmp"; }; MASKCOLOR IMAGE_ID_LIST @@ -1133,6 +1138,7 @@ File [ slovak ] = "lchout43.bmp"; File [ hungarian ] = "lchout36.bmp"; File [ slovenian ] = "lchout50.bmp"; + File [ welsh ] = "lchout53.bmp"; File [ catalan ] = "lchout37.bmp"; }; @@ -1168,6 +1174,7 @@ File [ slovak ] = "schoff43.bmp"; File [ hungarian ] = "schoff36.bmp"; File [ slovenian ] = "schoff50.bmp"; + File [ welsh ] = "schoff53.bmp"; File [ catalan ] = "schoff37.bmp"; }; @@ -1203,6 +1210,7 @@ File [ slovak ] = "lchoff43.bmp"; File [ hungarian ] = "lchoff36.bmp"; File [ slovenian ] = "lchoff50.bmp"; + File [ welsh ] = "lchoff53.bmp"; File [ catalan ] = "lchoff37.bmp"; }; diff -urN oo_cvs_2004-01-01/readlicense_oo/prj/d.lst oo_welsh/readlicense_oo/prj/d.lst --- oo_cvs_2004-01-01/readlicense_oo/prj/d.lst 2003-12-17 17:46:50.000000000 +0000 +++ oo_welsh/readlicense_oo/prj/d.lst 2004-01-02 10:25:07.000000000 +0000 @@ -43,6 +43,8 @@ mkdir: %_DEST%\bin%_EXT%\49\osl mkdir: %_DEST%\bin%_EXT%\50 mkdir: %_DEST%\bin%_EXT%\50\osl +mkdir: %_DEST%\bin%_EXT%\53 +mkdir: %_DEST%\bin%_EXT%\53\osl mkdir: %_DEST%\bin%_EXT%\55 mkdir: %_DEST%\bin%_EXT%\55\osl mkdir: %_DEST%\bin%_EXT%\66 @@ -104,6 +106,10 @@ ..\%__SRC%\misc\license\%GUI%\LICENSE %_DEST%\bin%_EXT%\50\osl\LICENSE50 ..\%__SRC%\misc\license\WNT\license.txt %_DEST%\bin%_EXT%\50\osl\license50.txt ..\%__SRC%\misc\license\%GUI%\license.html %_DEST%\bin%_EXT%\50\osl\LICENSE50.html +..\%__SRC%\misc\license\%GUI%\* %_DEST%\bin%_EXT%\53\osl\* +..\%__SRC%\misc\license\%GUI%\LICENSE %_DEST%\bin%_EXT%\53\osl\LICENSE53 +..\%__SRC%\misc\license\WNT\license.txt %_DEST%\bin%_EXT%\53\osl\license53.txt +..\%__SRC%\misc\license\%GUI%\license.html %_DEST%\bin%_EXT%\53\osl\LICENSE53.html ..\%__SRC%\misc\license\%GUI%\* %_DEST%\bin%_EXT%\37\osl\* ..\%__SRC%\misc\license\%GUI%\LICENSE %_DEST%\bin%_EXT%\37\osl\LICENSE37 ..\%__SRC%\misc\license\WNT\license.txt %_DEST%\bin%_EXT%\37\osl\license37.txt @@ -230,6 +236,9 @@ ..\%__SRC%\misc\50\* %_DEST%\bin%_EXT%\50\osl\* ..\%__SRC%\misc\50\readme50.txt %_DEST%\bin%_EXT%\50\osl\README50 ..\%__SRC%\misc\50\readme50.html %_DEST%\bin%_EXT%\50\osl\README50.html +..\%__SRC%\misc\53\* %_DEST%\bin%_EXT%\53\osl\* +..\%__SRC%\misc\53\readme53.txt %_DEST%\bin%_EXT%\53\osl\README53 +..\%__SRC%\misc\53\readme53.html %_DEST%\bin%_EXT%\53\osl\README53.html ..\%__SRC%\misc\55\* %_DEST%\bin%_EXT%\55\osl\* ..\%__SRC%\misc\55\readme55.txt %_DEST%\bin%_EXT%\55\osl\README55 ..\%__SRC%\misc\55\readme55.html %_DEST%\bin%_EXT%\55\osl\README55.html diff -urN oo_cvs_2004-01-01/sc/source/ui/src/toolbox.src oo_welsh/sc/source/ui/src/toolbox.src --- oo_cvs_2004-01-01/sc/source/ui/src/toolbox.src 2003-12-17 20:09:06.000000000 +0000 +++ oo_welsh/sc/source/ui/src/toolbox.src 2004-01-02 10:11:31.000000000 +0000 @@ -1928,6 +1928,7 @@ File [ slovak ] = "sc_out43.bmp" ; File [ hungarian ] = "sc_out36.bmp" ; File [ slovenian ] = "sc_out50.bmp" ; + File [ welsh ] = "sc_out53.bmp" ; File [ catalan ] = "sc_out37.bmp" ; }; @@ -1964,6 +1965,7 @@ File [ slovak ] = "lc_out43.bmp" ; File [ hungarian ] = "lc_out36.bmp" ; File [ slovenian ] = "lc_out50.bmp" ; + File [ welsh ] = "lc_out53.bmp" ; File [ catalan ] = "lc_out37.bmp" ; }; @@ -2000,6 +2002,7 @@ File [ slovak ] = "sch_out43.bmp" ; File [ hungarian ] = "sch_out36.bmp" ; File [ slovenian ] = "sch_out50.bmp" ; + File [ welsh ] = "sch_out53.bmp" ; File [ catalan ] = "sch_out37.bmp" ; }; @@ -2036,6 +2039,7 @@ File [ slovak ] = "lch_out43.bmp" ; File [ hungarian ] = "lch_out36.bmp" ; File [ slovenian ] = "lch_out50.bmp" ; + File [ welsh ] = "lch_out53.bmp" ; File [ catalan ] = "lch_out37.bmp" ; }; diff -urN oo_cvs_2004-01-01/scp/inc/gcfg.inc oo_welsh/scp/inc/gcfg.inc --- oo_cvs_2004-01-01/scp/inc/gcfg.inc 2003-12-17 20:37:56.000000000 +0000 +++ oo_welsh/scp/inc/gcfg.inc 2004-01-02 10:31:49.000000000 +0000 @@ -243,7 +243,6 @@ ident (35) = resid; \ ident (36) = resid; \ ident (37) = resid; \ - ident (50) = resid; \ ident (39) = resid; \ ident (42) = resid; \ ident (43) = resid; \ @@ -253,6 +252,8 @@ ident (47) = resid; \ ident (48) = resid; \ ident (49) = resid; \ + ident (50) = resid; \ + ident (53) = resid; \ ident (55) = resid; \ ident (66) = resid; \ ident (77) = resid; \ @@ -277,7 +278,6 @@ Name (35) = RESFILENAME(name,35); \ Name (36) = RESFILENAME(name,36); \ Name (37) = RESFILENAME(name,37); \ - Name (50) = RESFILENAME(name,50); \ Name (39) = RESFILENAME(name,39); \ Name (42) = RESFILENAME(name,42); \ Name (43) = RESFILENAME(name,43); \ @@ -287,6 +287,8 @@ Name (47) = RESFILENAME(name,47); \ Name (48) = RESFILENAME(name,48); \ Name (49) = RESFILENAME(name,49); \ + Name (50) = RESFILENAME(name,50); \ + Name (53) = RESFILENAME(name,53); \ Name (55) = RESFILENAME(name,55); \ Name (66) = RESFILENAME(name,66); \ Name (77) = RESFILENAME(name,77); \ @@ -311,7 +313,6 @@ Name (35) = SHORTRESFILENAME(name,35); \ Name (36) = SHORTRESFILENAME(name,36); \ Name (37) = SHORTRESFILENAME(name,37); \ - Name (50) = SHORTRESFILENAME(name,50); \ Name (39) = SHORTRESFILENAME(name,39); \ Name (42) = SHORTRESFILENAME(name,42); \ Name (43) = SHORTRESFILENAME(name,43); \ @@ -321,6 +322,8 @@ Name (47) = SHORTRESFILENAME(name,47); \ Name (48) = SHORTRESFILENAME(name,48); \ Name (49) = SHORTRESFILENAME(name,49); \ + Name (50) = SHORTRESFILENAME(name,50); \ + Name (53) = SHORTRESFILENAME(name,53); \ Name (55) = SHORTRESFILENAME(name,55); \ Name (66) = SHORTRESFILENAME(name,66); \ Name (77) = SHORTRESFILENAME(name,77); \ @@ -345,7 +348,6 @@ key (35) = READMETXTFILENAME(name,35,ext); \ key (36) = READMETXTFILENAME(name,36,ext); \ key (37) = READMETXTFILENAME(name,37,ext); \ - key (50) = READMETXTFILENAME(name,50,ext); \ key (39) = READMETXTFILENAME(name,39,ext); \ key (42) = READMETXTFILENAME(name,42,ext); \ key (43) = READMETXTFILENAME(name,43,ext); \ @@ -355,6 +357,8 @@ key (47) = READMETXTFILENAME(name,47,ext); \ key (48) = READMETXTFILENAME(name,48,ext); \ key (49) = READMETXTFILENAME(name,49,ext); \ + key (50) = READMETXTFILENAME(name,50,ext); \ + key (53) = READMETXTFILENAME(name,53,ext); \ key (55) = READMETXTFILENAME(name,55,ext); \ key (66) = READMETXTFILENAME(name,66,ext); \ key (77) = READMETXTFILENAME(name,77,ext); \ @@ -379,7 +383,6 @@ key (35) = READMEFILENAME(name,35); \ key (36) = READMEFILENAME(name,36); \ key (37) = READMEFILENAME(name,37); \ - key (50) = READMEFILENAME(name,50); \ key (39) = READMEFILENAME(name,39); \ key (42) = READMEFILENAME(name,42); \ key (43) = READMEFILENAME(name,43); \ @@ -389,6 +392,8 @@ key (47) = READMEFILENAME(name,47); \ key (48) = READMEFILENAME(name,48); \ key (49) = READMEFILENAME(name,49); \ + key (50) = READMEFILENAME(name,50); \ + key (53) = READMEFILENAME(name,53); \ key (55) = READMEFILENAME(name,55); \ key (66) = READMEFILENAME(name,66); \ key (77) = READMEFILENAME(name,77); \ @@ -413,7 +418,6 @@ Name (35) = EXTRAFILENAME(name,35); \ Name (36) = EXTRAFILENAME(name,36); \ Name (37) = EXTRAFILENAME(name,37); \ - Name (50) = EXTRAFILENAME(name,50); \ Name (39) = EXTRAFILENAME(name,39); \ Name (42) = EXTRAFILENAME(name,42); \ Name (43) = EXTRAFILENAME(name,43); \ @@ -423,6 +427,8 @@ Name (47) = EXTRAFILENAME(name,47); \ Name (48) = EXTRAFILENAME(name,48); \ Name (49) = EXTRAFILENAME(name,49); \ + Name (50) = EXTRAFILENAME(name,50); \ + Name (53) = EXTRAFILENAME(name,53); \ Name (55) = EXTRAFILENAME(name,55); \ Name (66) = EXTRAFILENAME(name,66); \ Name (77) = EXTRAFILENAME(name,77); \ @@ -447,7 +453,6 @@ Name (35) = STRING(name); \ Name (36) = STRING(name); \ Name (37) = STRING(name); \ - Name (50) = STRING(name); \ Name (39) = STRING(name); \ Name (42) = STRING(name); \ Name (43) = STRING(name); \ @@ -457,6 +462,8 @@ Name (47) = STRING(name); \ Name (48) = STRING(name); \ Name (49) = STRING(name); \ + Name (50) = STRING(name); \ + Name (53) = STRING(name); \ Name (55) = STRING(name); \ Name (66) = STRING(name); \ Name (77) = STRING(name); \ @@ -481,7 +488,6 @@ Name (35) = HELPFILENAME(name,35); \ Name (36) = HELPFILENAME(name,36); \ Name (37) = HELPFILENAME(name,37); \ - Name (50) = HELPFILENAME(name,50); \ Name (39) = HELPFILENAME(name,39); \ Name (42) = HELPFILENAME(name,42); \ Name (43) = HELPFILENAME(name,43); \ @@ -491,6 +497,8 @@ Name (47) = HELPFILENAME(name,47); \ Name (48) = HELPFILENAME(name,48); \ Name (49) = HELPFILENAME(name,49); \ + Name (50) = HELPFILENAME(name,50); \ + Name (53) = HELPFILENAME(name,53); \ Name (55) = HELPFILENAME(name,55); \ Name (66) = HELPFILENAME(name,66); \ Name (77) = HELPFILENAME(name,77); \ @@ -515,7 +523,6 @@ Name (35) = HELPFILENAME(name,35x); \ Name (36) = HELPFILENAME(name,36x); \ Name (37) = HELPFILENAME(name,37x); \ - Name (50) = HELPFILENAME(name,50x); \ Name (39) = HELPFILENAME(name,39x); \ Name (42) = HELPFILENAME(name,42x); \ Name (43) = HELPFILENAME(name,43x); \ @@ -525,6 +532,8 @@ Name (47) = HELPFILENAME(name,47x); \ Name (48) = HELPFILENAME(name,48x); \ Name (49) = HELPFILENAME(name,49x); \ + Name (50) = HELPFILENAME(name,50x); \ + Name (53) = HELPFILENAME(name,53x); \ Name (55) = HELPFILENAME(name,55x); \ Name (66) = HELPFILENAME(name,66x); \ Name (77) = HELPFILENAME(name,77x); \ @@ -549,7 +558,6 @@ Name (35) = HELPFILENAME(name,endung); \ Name (36) = HELPFILENAME(name,endung); \ Name (37) = HELPFILENAME(name,endung); \ - Name (50) = HELPFILENAME(name,endung); \ Name (39) = HELPFILENAME(name,endung); \ Name (42) = HELPFILENAME(name,endung); \ Name (43) = HELPFILENAME(name,endung); \ @@ -559,6 +567,8 @@ Name (47) = HELPFILENAME(name,endung); \ Name (48) = HELPFILENAME(name,endung); \ Name (49) = HELPFILENAME(name,endung); \ + Name (50) = HELPFILENAME(name,endung); \ + Name (53) = HELPFILENAME(name,endung); \ Name (55) = HELPFILENAME(name,endung); \ Name (66) = HELPFILENAME(name,endung); \ Name (77) = HELPFILENAME(name,endung); \ @@ -583,7 +593,6 @@ Dir (35) = GID_DIR_HELP_35; \ Dir (36) = GID_DIR_HELP_36; \ Dir (37) = GID_DIR_HELP_37; \ - Dir (50) = GID_DIR_HELP_50; \ Dir (39) = GID_DIR_HELP_39; \ Dir (42) = GID_DIR_HELP_42; \ Dir (43) = GID_DIR_HELP_43; \ @@ -592,6 +601,8 @@ Dir (46) = GID_DIR_HELP_46; \ Dir (48) = GID_DIR_HELP_48; \ Dir (49) = GID_DIR_HELP_49; \ + Dir (50) = GID_DIR_HELP_50; \ + Dir (53) = GID_DIR_HELP_53; \ Dir (55) = GID_DIR_HELP_55; \ Dir (66) = GID_DIR_HELP_66; \ Dir (77) = GID_DIR_HELP_77; \ @@ -616,7 +627,6 @@ DosName (35) = STRING(name); \ DosName (36) = STRING(name); \ DosName (37) = STRING(name); \ - DosName (50) = STRING(name); \ DosName (39) = STRING(name); \ DosName (42) = STRING(name); \ DosName (43) = STRING(name); \ @@ -626,6 +636,8 @@ DosName (47) = STRING(name); \ DosName (48) = STRING(name); \ DosName (49) = STRING(name); \ + DosName (50) = STRING(name); \ + DosName (53) = STRING(name); \ DosName (55) = STRING(name); \ DosName (66) = STRING(name); \ DosName (77) = STRING(name); \ @@ -650,7 +662,6 @@ DosName (35) = "finnish"; \ DosName (36) = "hungarian"; \ DosName (37) = "catalan"; \ - DosName (50) = "slovenian"; \ DosName (39) = "italian"; \ DosName (42) = "czech"; \ DosName (43) = "slovak"; \ @@ -660,6 +671,8 @@ DosName (47) = "norwegian"; \ DosName (48) = "polish"; \ DosName (49) = "german"; \ + DosName (50) = "slovenian"; \ + DosName (53) = "welsh"; \ DosName (55) = "portuguese_brazilian"; \ DosName (66) = "thai"; \ DosName (77) = "estonian"; \ @@ -684,7 +697,6 @@ DosName (35) = "fi"; \ DosName (36) = "hu"; \ DosName (37) = "ca"; \ - DosName (50) = "sl"; \ DosName (39) = "it"; \ DosName (42) = "cs"; \ DosName (43) = "sk"; \ @@ -694,6 +706,8 @@ DosName (47) = "no"; \ DosName (48) = "pl"; \ DosName (49) = "de"; \ + DosName (50) = "sl"; \ + DosName (53) = "cy"; \ DosName (55) = "pt-BR"; \ DosName (66) = "th"; \ DosName (77) = "et"; \ @@ -718,7 +732,6 @@ DosName (35) = "fi"; \ DosName (36) = "hu"; \ DosName (37) = "ca"; \ - DosName (50) = "sl"; \ DosName (39) = "it"; \ DosName (42) = "cs"; \ DosName (43) = "sk"; \ @@ -728,6 +741,8 @@ DosName (47) = "no"; \ DosName (48) = "pl"; \ DosName (49) = "de"; \ + DosName (50) = "sl"; \ + DosName (53) = "cy"; \ DosName (55) = "pt-BR"; \ DosName (66) = "th"; \ DosName (77) = "et"; \ @@ -752,7 +767,6 @@ Section (35) = STRING(ident##-35); \ Section (36) = STRING(ident##-36); \ Section (37) = STRING(ident##-37); \ - Section (50) = STRING(ident##-50); \ Section (39) = STRING(ident##-39); \ Section (42) = STRING(ident##-42); \ Section (43) = STRING(ident##-43); \ @@ -762,6 +776,8 @@ Section (47) = STRING(ident##-47); \ Section (48) = STRING(ident##-48); \ Section (49) = STRING(ident##-49); \ + Section (50) = STRING(ident##-50); \ + Section (53) = STRING(ident##-53); \ Section (55) = STRING(ident##-55); \ Section (66) = STRING(ident##-66); \ Section (77) = STRING(ident##-77); \ @@ -806,7 +822,6 @@ Key (35) = STRING(1035); \ Key (36) = STRING(1038); \ Key (37) = STRING(1037); \ - Key (50) = STRING(1060); \ Key (39) = STRING(1040); \ Key (42) = STRING(1029); \ Key (43) = STRING(1051); \ @@ -815,6 +830,8 @@ Key (47) = STRING(1044); \ Key (48) = STRING(1045); \ Key (49) = STRING(1031); \ + Key (50) = STRING(1060); \ + Key (53) = STRING(1063); \ Key (55) = STRING(1046); \ Key (66) = STRING(1054); \ Key (77) = STRING(1061); \ @@ -839,7 +856,6 @@ Key (35) = STRING(fi); \ Key (36) = STRING(hu); \ Key (37) = STRING(ca); \ - Key (50) = STRING(sl); \ Key (39) = STRING(it); \ Key (42) = STRING(cs); \ Key (43) = STRING(sk); \ @@ -849,6 +865,8 @@ Key (47) = STRING(no); \ Key (48) = STRING(pl); \ Key (49) = STRING(de); \ + Key (50) = STRING(sl); \ + Key (53) = STRING(cy); \ Key (55) = STRING(pt-BR); \ Key (66) = STRING(th); \ Key (77) = STRING(et); \ @@ -873,7 +891,6 @@ Value (35) = STRING(1035); \ Value (36) = STRING(1038); \ Value (37) = STRING(1037); \ - Value (50) = STRING(1060); \ Value (39) = STRING(1040); \ Value (42) = STRING(1029); \ Value (43) = STRING(1051); \ @@ -882,6 +899,8 @@ Value (47) = STRING(1044); \ Value (48) = STRING(1045); \ Value (49) = STRING(1031); \ + Value (50) = STRING(1060); \ + Value (53) = STRING(1063); \ Value (55) = STRING(1046); \ Value (66) = STRING(1054); \ Value (77) = STRING(1061); \ @@ -906,7 +925,6 @@ Value (35) = STRING(fi); \ Value (36) = STRING(hu); \ Value (37) = STRING(ca); \ - Value (50) = STRING(sl); \ Value (39) = STRING(it); \ Value (42) = STRING(cs); \ Value (43) = STRING(sk); \ @@ -916,6 +934,8 @@ Value (47) = STRING(no); \ Value (48) = STRING(pl); \ Value (49) = STRING(de); \ + Value (50) = STRING(sl); \ + Value (53) = STRING(cy); \ Value (55) = STRING(pt-BR); \ Value (66) = STRING(th); \ Value (77) = STRING(et); \ @@ -940,7 +960,6 @@ Value (35) = STRING(fi); \ Value (36) = STRING(hu); \ Value (37) = STRING(ca); \ - Value (50) = STRING(sl); \ Value (39) = STRING(it); \ Value (42) = STRING(cs); \ Value (43) = STRING(sk); \ @@ -950,6 +969,8 @@ Value (47) = STRING(no); \ Value (48) = STRING(pl); \ Value (49) = STRING(de); \ + Value (50) = STRING(sl); \ + Value (53) = STRING(cy); \ Value (55) = STRING(pt-BR); \ Value (66) = STRING(th); \ Value (77) = STRING(et); \ @@ -974,7 +995,6 @@ Value (35) = STRING(fi); \ Value (36) = STRING(hu); \ Value (37) = STRING(ca); \ - Value (50) = STRING(sl); \ Value (39) = STRING(it); \ Value (42) = STRING(cs); \ Value (43) = STRING(sk); \ @@ -984,6 +1004,8 @@ Value (47) = STRING(no); \ Value (48) = STRING(pl); \ Value (49) = STRING(de); \ + Value (50) = STRING(sl); \ + Value (53) = STRING(cy); \ Value (55) = STRING(pt-BR); \ Value (66) = STRING(th); \ Value (77) = STRING(et); \ @@ -1008,7 +1030,6 @@ Value (35) = STRING(35); \ Value (36) = STRING(36); \ Value (37) = STRING(37); \ - Value (50) = STRING(50); \ Value (39) = STRING(39); \ Value (42) = STRING(42); \ Value (43) = STRING(43); \ @@ -1018,6 +1039,8 @@ Value (47) = STRING(47); \ Value (48) = STRING(48); \ Value (49) = STRING(49); \ + Value (50) = STRING(50); \ + Value (53) = STRING(53); \ Value (55) = STRING(55); \ Value (66) = STRING(66); \ Value (77) = STRING(77); \ diff -urN oo_cvs_2004-01-01/scp/inc/gid.inc oo_welsh/scp/inc/gid.inc --- oo_cvs_2004-01-01/scp/inc/gid.inc 2003-12-17 20:38:22.000000000 +0000 +++ oo_welsh/scp/inc/gid.inc 2004-01-02 10:34:34.000000000 +0000 @@ -344,6 +344,7 @@ #define GID_DIR_HELP_46 gid_Dir_Help_46 #define GID_DIR_HELP_48 gid_Dir_Help_48 #define GID_DIR_HELP_49 gid_Dir_Help_49 +#define GID_DIR_HELP_53 gid_Dir_Help_53 #define GID_DIR_HELP_55 gid_Dir_Help_55 #define GID_DIR_HELP_66 gid_Dir_Help_66 #define GID_DIR_HELP_77 gid_Dir_Help_77 @@ -1909,6 +1910,7 @@ #define GID_FILE_LIB_W039 gid_File_Lib_W039 #define GID_FILE_LIB_W037 gid_File_Lib_W037 #define GID_FILE_LIB_W050 gid_File_Lib_W050 +#define GID_FILE_LIB_W053 gid_File_Lib_W053 #define GID_FILE_LIB_W036 gid_File_Lib_W036 #define GID_FILE_LIB_W035 gid_File_Lib_W035 #define GID_FILE_LIB_W034 gid_File_Lib_W034 @@ -1971,6 +1973,7 @@ #define GID_FILE_LIB_42F gid_File_Lib_42f #define GID_FILE_LIB_39F gid_File_Lib_39f #define GID_FILE_LIB_37F gid_File_Lib_37f +#define GID_FILE_LIB_53F gid_File_Lib_53f #define GID_FILE_LIB_50F gid_File_Lib_50f #define GID_FILE_LIB_36F gid_File_Lib_36f #define GID_FILE_LIB_35F gid_File_Lib_35f @@ -2046,6 +2049,7 @@ #define GID_FILE_42F gid_File_42f #define GID_FILE_39F gid_File_39f #define GID_FILE_37F gid_File_37f +#define GID_FILE_53F gid_File_53f #define GID_FILE_50F gid_File_50f #define GID_FILE_36F gid_File_36f #define GID_FILE_35F gid_File_35f diff -urN oo_cvs_2004-01-01/scp/source/cde/unxbasic_cde.scp oo_welsh/scp/source/cde/unxbasic_cde.scp --- oo_cvs_2004-01-01/scp/source/cde/unxbasic_cde.scp 2003-12-17 20:39:56.000000000 +0000 +++ oo_welsh/scp/source/cde/unxbasic_cde.scp 2004-01-02 10:36:55.000000000 +0000 @@ -47,8 +47,6 @@ response = SiQueryBox ( STR_BASIC_CDEINT_NETWORK_STRING1#36 & chr(10) & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING2#36 & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING3#36 & chr(10)& chr(10) , MB_YESNO + MB_ICONQUESTION, STR_BASIC_SETUPTITEL#36 ) Case 37 response = SiQueryBox ( STR_BASIC_CDEINT_NETWORK_STRING1#37 & chr(10) & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING2#37 & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING3#37 & chr(10)& chr(10) , MB_YESNO + MB_ICONQUESTION, STR_BASIC_SETUPTITEL#37 ) - Case 50 - response = SiQueryBox ( STR_BASIC_CDEINT_NETWORK_STRING1#50 & chr(10) & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING2#50 & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING3#50 & chr(10)& chr(10) , MB_YESNO + MB_ICONQUESTION, STR_BASIC_SETUPTITEL#50 ) Case 39 response = SiQueryBox ( STR_BASIC_CDEINT_NETWORK_STRING1#39 & chr(10) & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING2#39 & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING3#39 & chr(10)& chr(10) , MB_YESNO + MB_ICONQUESTION, STR_BASIC_SETUPTITEL#39 ) Case 42 @@ -67,6 +65,10 @@ response = SiQueryBox ( STR_BASIC_CDEINT_NETWORK_STRING1#48 & chr(10) & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING2#48 & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING3#48 & chr(10)& chr(10) , MB_YESNO + MB_ICONQUESTION, STR_BASIC_SETUPTITEL#48 ) Case 49 response = SiQueryBox ( STR_BASIC_CDEINT_NETWORK_STRING1#49 & chr(10) & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING2#49 & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING3#49 & chr(10)& chr(10) , MB_YESNO + MB_ICONQUESTION, STR_BASIC_SETUPTITEL#49 ) + Case 50 + response = SiQueryBox ( STR_BASIC_CDEINT_NETWORK_STRING1#50 & chr(10) & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING2#50 & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING3#50 & chr(10)& chr(10) , MB_YESNO + MB_ICONQUESTION, STR_BASIC_SETUPTITEL#50 ) + Case 53 + response = SiQueryBox ( STR_BASIC_CDEINT_NETWORK_STRING1#53 & chr(10) & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING2#53 & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING3#53 & chr(10)& chr(10) , MB_YESNO + MB_ICONQUESTION, STR_BASIC_SETUPTITEL#53 ) Case 55 response = SiQueryBox ( STR_BASIC_CDEINT_NETWORK_STRING1#55 & chr(10) & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING2#55 & chr(10) & STR_BASIC_CDEINT_NETWORK_STRING3#55 & chr(10)& chr(10) , MB_YESNO + MB_ICONQUESTION, STR_BASIC_SETUPTITEL#55 ) Case 66 @@ -138,8 +140,6 @@ language_parameter = "hu" Case 37 language_parameter = "ca" - Case 50 - language_parameter = "sl" Case 39 language_parameter = "it" Case 42 @@ -158,6 +158,10 @@ language_parameter = "pl" Case 49 language_parameter = "de" + Case 50 + language_parameter = "sl" + Case 53 + language_parameter = "cy" Case 55 language_parameter = "pt-BR" Case 66 @@ -262,8 +266,6 @@ SiMsgBox (STR_BASIC_CDEINT_NETWORK#36) Case 37 SiMsgBox (STR_BASIC_CDEINT_NETWORK#37) - Case 50 - SiMsgBox (STR_BASIC_CDEINT_NETWORK#50) Case 39 SiMsgBox (STR_BASIC_CDEINT_NETWORK#39) Case 42 @@ -282,6 +284,10 @@ SiMsgBox (STR_BASIC_CDEINT_NETWORK#48) Case 49 SiMsgBox (STR_BASIC_CDEINT_NETWORK#49) + Case 50 + SiMsgBox (STR_BASIC_CDEINT_NETWORK#50) + Case 53 + SiMsgBox (STR_BASIC_CDEINT_NETWORK#53) Case 55 SiMsgBox (STR_BASIC_CDEINT_NETWORK#55) Case 66 @@ -465,8 +471,6 @@ language_parameter = "hu" Case 37 language_parameter = "ca" - Case 50 - language_parameter = "sl" Case 39 language_parameter = "it" Case 42 @@ -485,6 +489,10 @@ language_parameter = "pl" Case 49 language_parameter = "de" + Case 50 + language_parameter = "sl" + Case 53 + language_parameter = "cy" Case 55 language_parameter = "pt_BR" Case 66 @@ -576,8 +584,6 @@ SiMsgBox (STR_BASIC_CDEINT#36) Case 37 SiMsgBox (STR_BASIC_CDEINT#37) - Case 50 - SiMsgBox (STR_BASIC_CDEINT#50) Case 39 SiMsgBox (STR_BASIC_CDEINT#39) Case 42 @@ -596,6 +602,10 @@ SiMsgBox (STR_BASIC_CDEINT#48) Case 49 SiMsgBox (STR_BASIC_CDEINT#49) + Case 50 + SiMsgBox (STR_BASIC_CDEINT#50) + Case 53 + SiMsgBox (STR_BASIC_CDEINT#53) Case 55 SiMsgBox (STR_BASIC_CDEINT#55) Case 66 diff -urN oo_cvs_2004-01-01/scp/source/fonts/files_fonts.scp oo_welsh/scp/source/fonts/files_fonts.scp --- oo_cvs_2004-01-01/scp/source/fonts/files_fonts.scp 2003-12-17 20:42:06.000000000 +0000 +++ oo_welsh/scp/source/fonts/files_fonts.scp 2004-01-02 10:37:28.000000000 +0000 @@ -398,7 +398,6 @@ Name (35) = FONTWINFILENAME(/font_ui_wgl/soui.ttf); Name (36) = FONTWINFILENAME(/font_ui_wgl/soui.ttf); Name (37) = FONTWINFILENAME(/font_ui_wgl/soui.ttf); - Name (50) = FONTWINFILENAME(/font_ui_wgl/soui.ttf); Name (39) = FONTWINFILENAME(/font_ui_wgl/soui.ttf); Name (42) = FONTWINFILENAME(/font_ui_wgl/soui.ttf); Name (43) = FONTWINFILENAME(/font_ui_wgl/soui.ttf); @@ -408,6 +407,8 @@ Name (47) = FONTWINFILENAME(/font_ui_wgl/soui.ttf); Name (48) = FONTWINFILENAME(/font_ui_wgl/soui.ttf); Name (49) = FONTWINFILENAME(/font_ui_wgl/soui.ttf); + Name (50) = FONTWINFILENAME(/font_ui_wgl/soui.ttf); + Name (53) = FONTWINFILENAME(/font_ui_wgl/soui.ttf); Name (55) = FONTWINFILENAME(/font_ui_wgl/soui.ttf); Name (66) = FONTWINFILENAME(/font_ui_wgl/soui.ttf); Name (77) = FONTWINFILENAME(/font_ui_wgl/soui.ttf); @@ -881,7 +882,6 @@ Name (35) = FONTUNXFILENAME(/font_ui_wgl/soui.ttf); Name (36) = FONTUNXFILENAME(/font_ui_wgl/soui.ttf); Name (37) = FONTUNXFILENAME(/font_ui_wgl/soui.ttf); - Name (50) = FONTUNXFILENAME(/font_ui_wgl/soui.ttf); Name (39) = FONTUNXFILENAME(/font_ui_wgl/soui.ttf); Name (42) = FONTUNXFILENAME(/font_ui_wgl/soui.ttf); Name (43) = FONTUNXFILENAME(/font_ui_wgl/soui.ttf); @@ -891,6 +891,8 @@ Name (47) = FONTUNXFILENAME(/font_ui_wgl/soui.ttf); Name (48) = FONTUNXFILENAME(/font_ui_wgl/soui.ttf); Name (49) = FONTUNXFILENAME(/font_ui_wgl/soui.ttf); + Name (50) = FONTUNXFILENAME(/font_ui_wgl/soui.ttf); + Name (53) = FONTUNXFILENAME(/font_ui_wgl/soui.ttf); Name (55) = FONTUNXFILENAME(/font_ui_wgl/soui.ttf); Name (66) = FONTUNXFILENAME(/font_ui_wgl/soui.ttf); Name (77) = FONTUNXFILENAME(/font_ui_wgl/soui.ttf); diff -urN oo_cvs_2004-01-01/scp/source/global/setupzip.scp oo_welsh/scp/source/global/setupzip.scp --- oo_cvs_2004-01-01/scp/source/global/setupzip.scp 2003-12-17 20:42:45.000000000 +0000 +++ oo_welsh/scp/source/global/setupzip.scp 2004-01-02 10:38:04.000000000 +0000 @@ -634,7 +634,6 @@ Name (35) = "fontunxpsprint.zip"; Name (36) = "fontunxpsprint.zip"; Name (37) = "fontunxpsprint.zip"; - Name (50) = "fontunxpsprint.zip"; Name (39) = "fontunxpsprint.zip"; Name (42) = "fontunxpsprint.zip"; Name (43) = "fontunxpsprint.zip"; @@ -644,6 +643,8 @@ Name (47) = "fontunxpsprint.zip"; Name (48) = "fontunxpsprint.zip"; Name (49) = "fontunxpsprint.zip"; + Name (50) = "fontunxpsprint.zip"; + Name (53) = "fontunxpsprint.zip"; Name (55) = "fontunxpsprint.zip"; Name (66) = "fontunxpsprint.zip"; Name (77) = "fontunxpsprint.zip"; diff -urN oo_cvs_2004-01-01/scp/source/office/basic.scp oo_welsh/scp/source/office/basic.scp --- oo_cvs_2004-01-01/scp/source/office/basic.scp 2003-12-17 20:48:16.000000000 +0000 +++ oo_welsh/scp/source/office/basic.scp 2004-01-02 10:41:30.000000000 +0000 @@ -82,8 +82,6 @@ SiMsgBox(STR_BASIC_ADABASINST1#36 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#36) Case 37 SiMsgBox(STR_BASIC_ADABASINST1#37 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#37) - Case 50 - SiMsgBox(STR_BASIC_ADABASINST1#50 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#50) Case 39 SiMsgBox(STR_BASIC_ADABASINST1#39 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#39) Case 42 @@ -102,6 +100,10 @@ SiMsgBox(STR_BASIC_ADABASINST1#48 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#48) Case 49 SiMsgBox(STR_BASIC_ADABASINST1#49 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#49) + Case 50 + SiMsgBox(STR_BASIC_ADABASINST1#50 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#50) + Case 53 + SiMsgBox(STR_BASIC_ADABASINST1#53 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#53) Case 55 SiMsgBox(STR_BASIC_ADABASINST1#55 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#55) Case 66 @@ -159,8 +161,6 @@ SiMsgBox(STR_BASIC_ADABASPFAD#36) Case 37 SiMsgBox(STR_BASIC_ADABASPFAD#37) - Case 50 - SiMsgBox(STR_BASIC_ADABASPFAD#50) Case 39 SiMsgBox(STR_BASIC_ADABASPFAD#39) Case 42 @@ -179,6 +179,10 @@ SiMsgBox(STR_BASIC_ADABASPFAD#48) Case 49 SiMsgBox(STR_BASIC_ADABASPFAD#49) + Case 50 + SiMsgBox(STR_BASIC_ADABASPFAD#50) + Case 53 + SiMsgBox(STR_BASIC_ADABASPFAD#53) Case 55 SiMsgBox(STR_BASIC_ADABASPFAD#55) Case 66 @@ -396,8 +400,6 @@ SetDefaultModuleByID ("gid_Module_Optional_Language_Finnish", True) Case 36 SetDefaultModuleByID ("gid_Module_Optional_Language_Hungarian", True) - Case 50 - SetDefaultModuleByID ("gid_Module_Optional_Language_Slovenian", True) Case 39 SetDefaultModuleByID ("gid_Module_Optional_Language_Italy", True) Case 42 @@ -416,6 +418,10 @@ SetDefaultModuleByID ("gid_Module_Optional_Language_Polish", True) Case 49 SetDefaultModuleByID ("gid_Module_Optional_Language_German", True) + Case 50 + SetDefaultModuleByID ("gid_Module_Optional_Language_Slovenian", True) + Case 53 + SetDefaultModuleByID ("gid_Module_Optional_Language_Welsh", True) Case 55 SetDefaultModuleByID ("gid_Module_Optional_Language_Brazilian", True) Case 77 @@ -719,7 +725,7 @@ dim isoresource as String dim newisoresource as String - countrynumber = 31 + countrynumber = 32 dim countrystrings(countrynumber) as String @@ -743,18 +749,19 @@ countrystrings(17) = "47" countrystrings(18) = "48" countrystrings(19) = "49" - countrystrings(20) = "55" - countrystrings(21) = "66" - countrystrings(22) = "77" - countrystrings(23) = "81" - countrystrings(24) = "82" - countrystrings(25) = "86" - countrystrings(26) = "88" - countrystrings(27) = "90" - countrystrings(28) = "91" - countrystrings(29) = "96" - countrystrings(30) = "97" - countrystrings(31) = "99" + countrystrings(20) = "53" + countrystrings(21) = "55" + countrystrings(22) = "66" + countrystrings(23) = "77" + countrystrings(24) = "81" + countrystrings(25) = "82" + countrystrings(26) = "86" + countrystrings(27) = "88" + countrystrings(28) = "90" + countrystrings(29) = "91" + countrystrings(30) = "96" + countrystrings(31) = "97" + countrystrings(32) = "99" resourcePath = DirEntry( GetSetupEnv.DestPath, "program", "resource" ) intVclNr = GetMajor() diff -urN oo_cvs_2004-01-01/scp/source/office/dir.scp oo_welsh/scp/source/office/dir.scp --- oo_cvs_2004-01-01/scp/source/office/dir.scp 2003-12-17 20:49:21.000000000 +0000 +++ oo_welsh/scp/source/office/dir.scp 2004-01-02 10:42:20.000000000 +0000 @@ -986,11 +986,6 @@ DosName = "37"; End -Directory GID_DIR_HELP_50 - ParentID = GID_DIR_HELP; - DosName = "50"; -End - Directory GID_DIR_HELP_39 ParentID = GID_DIR_HELP; DosName = "39"; @@ -1026,6 +1021,16 @@ DosName = "49"; End +Directory GID_DIR_HELP_50 + ParentID = GID_DIR_HELP; + DosName = "50"; +End + +Directory GID_DIR_HELP_53 + ParentID = GID_DIR_HELP; + DosName = "53"; +End + Directory GID_DIR_HELP_55 ParentID = GID_DIR_HELP; DosName = "55"; diff -urN oo_cvs_2004-01-01/scp/source/office/files.scp oo_welsh/scp/source/office/files.scp --- oo_cvs_2004-01-01/scp/source/office/files.scp 2003-12-17 20:49:39.000000000 +0000 +++ oo_welsh/scp/source/office/files.scp 2004-01-02 10:42:43.000000000 +0000 @@ -2259,6 +2259,7 @@ Name (46) = "samchapters46.zip"; Name (49) = "samchapters49.zip"; Name (50) = "samchapters50.zip"; + Name (53) = "samchapters53.zip"; Name (55) = "samchapters55.zip"; Name (66) = "samchapters66.zip"; Name (77) = "samchapters77.zip"; diff -urN oo_cvs_2004-01-01/scp/source/office/profile.scp oo_welsh/scp/source/office/profile.scp --- oo_cvs_2004-01-01/scp/source/office/profile.scp 2003-12-17 20:50:35.000000000 +0000 +++ oo_welsh/scp/source/office/profile.scp 2004-01-02 10:45:20.000000000 +0000 @@ -2687,7 +2687,6 @@ Value (35) = "FALSE"; Value (36) = "FALSE"; Value (37) = "FALSE"; - Value (50) = "FALSE"; Value (39) = "FALSE"; Value (42) = "FALSE"; Value (43) = "FALSE"; @@ -2697,6 +2696,8 @@ Value (47) = "FALSE"; Value (48) = "FALSE"; Value (49) = "FALSE"; + Value (50) = "FALSE"; + Value (53) = "FALSE"; Value (55) = "FALSE"; Value (66) = "FALSE"; Value (77) = "FALSE"; @@ -2726,7 +2727,6 @@ Value (35) = "FALSE"; Value (36) = "FALSE"; Value (37) = "FALSE"; - Value (50) = "FALSE"; Value (39) = "FALSE"; Value (42) = "FALSE"; Value (43) = "FALSE"; @@ -2736,6 +2736,8 @@ Value (47) = "FALSE"; Value (48) = "FALSE"; Value (49) = "FALSE"; + Value (50) = "FALSE"; + Value (53) = "FALSE"; Value (55) = "FALSE"; Value (66) = "FALSE"; Value (77) = "FALSE"; @@ -2765,7 +2767,6 @@ Value (35) = "FALSE"; Value (36) = "FALSE"; Value (37) = "FALSE"; - Value (50) = "FALSE"; Value (39) = "FALSE"; Value (42) = "FALSE"; Value (43) = "FALSE"; @@ -2775,6 +2776,8 @@ Value (47) = "FALSE"; Value (48) = "FALSE"; Value (49) = "FALSE"; + Value (50) = "FALSE"; + Value (53) = "FALSE"; Value (55) = "FALSE"; Value (66) = "FALSE"; Value (77) = "FALSE"; @@ -2804,7 +2807,6 @@ Value (35) = "FALSE"; Value (36) = "FALSE"; Value (37) = "FALSE"; - Value (50) = "FALSE"; Value (39) = "FALSE"; Value (42) = "FALSE"; Value (43) = "FALSE"; @@ -2814,6 +2816,8 @@ Value (47) = "FALSE"; Value (48) = "FALSE"; Value (49) = "FALSE"; + Value (50) = "FALSE"; + Value (53) = "FALSE"; Value (55) = "FALSE"; Value (66) = "FALSE"; Value (77) = "FALSE"; @@ -2843,7 +2847,6 @@ Value (35) = "FALSE"; Value (36) = "FALSE"; Value (37) = "FALSE"; - Value (50) = "FALSE"; Value (39) = "FALSE"; Value (42) = "FALSE"; Value (43) = "FALSE"; @@ -2853,6 +2856,8 @@ Value (47) = "FALSE"; Value (48) = "FALSE"; Value (49) = "FALSE"; + Value (50) = "FALSE"; + Value (53) = "FALSE"; Value (55) = "FALSE"; Value (66) = "FALSE"; Value (77) = "FALSE"; @@ -2882,7 +2887,6 @@ Value (35) = "FALSE"; Value (36) = "FALSE"; Value (37) = "FALSE"; - Value (50) = "FALSE"; Value (39) = "FALSE"; Value (42) = "FALSE"; Value (43) = "FALSE"; @@ -2892,6 +2896,8 @@ Value (47) = "FALSE"; Value (48) = "FALSE"; Value (49) = "FALSE"; + Value (50) = "FALSE"; + Value (53) = "FALSE"; Value (55) = "FALSE"; Value (66) = "FALSE"; Value (77) = "FALSE"; @@ -2921,7 +2927,6 @@ Value (35) = "FALSE"; Value (36) = "FALSE"; Value (37) = "FALSE"; - Value (50) = "FALSE"; Value (39) = "FALSE"; Value (42) = "FALSE"; Value (43) = "FALSE"; @@ -2931,6 +2936,8 @@ Value (47) = "FALSE"; Value (48) = "FALSE"; Value (49) = "FALSE"; + Value (50) = "FALSE"; + Value (53) = "FALSE"; Value (55) = "FALSE"; Value (66) = "FALSE"; Value (77) = "FALSE"; @@ -2960,7 +2967,6 @@ Value (35) = "FALSE"; Value (36) = "FALSE"; Value (37) = "FALSE"; - Value (50) = "FALSE"; Value (39) = "FALSE"; Value (42) = "FALSE"; Value (43) = "FALSE"; @@ -2970,6 +2976,8 @@ Value (47) = "FALSE"; Value (48) = "FALSE"; Value (49) = "FALSE"; + Value (50) = "FALSE"; + Value (53) = "FALSE"; Value (55) = "FALSE"; Value (66) = "FALSE"; Value (77) = "FALSE"; @@ -2999,7 +3007,6 @@ Value (35) = "FALSE"; Value (36) = "FALSE"; Value (37) = "FALSE"; - Value (50) = "FALSE"; Value (39) = "FALSE"; Value (42) = "FALSE"; Value (43) = "FALSE"; @@ -3009,6 +3016,8 @@ Value (47) = "FALSE"; Value (48) = "FALSE"; Value (49) = "FALSE"; + Value (50) = "FALSE"; + Value (53) = "FALSE"; Value (55) = "FALSE"; Value (66) = "FALSE"; Value (77) = "FALSE"; @@ -3038,7 +3047,6 @@ Value (35) = "TRUE"; Value (36) = "TRUE"; Value (37) = "TRUE"; - Value (50) = "TRUE"; Value (39) = "TRUE"; Value (42) = "TRUE"; Value (43) = "TRUE"; @@ -3048,6 +3056,8 @@ Value (47) = "TRUE"; Value (48) = "TRUE"; Value (49) = "TRUE"; + Value (50) = "TRUE"; + Value (53) = "TRUE"; Value (55) = "TRUE"; Value (66) = "TRUE"; Value (77) = "TRUE"; @@ -3077,7 +3087,6 @@ Value (35) = "FALSE"; Value (36) = "FALSE"; Value (37) = "FALSE"; - Value (50) = "FALSE"; Value (39) = "FALSE"; Value (42) = "FALSE"; Value (43) = "FALSE"; @@ -3087,6 +3096,8 @@ Value (47) = "FALSE"; Value (48) = "FALSE"; Value (49) = "FALSE"; + Value (50) = "FALSE"; + Value (53) = "FALSE"; Value (55) = "FALSE"; Value (66) = "TRUE"; Value (77) = "FALSE"; @@ -3125,6 +3136,8 @@ Value (47) = "FALSE"; Value (48) = "FALSE"; Value (49) = "FALSE"; + Value (50) = "FALSE"; + Value (53) = "FALSE"; Value (55) = "FALSE"; Value (66) = "FALSE"; Value (81) = "FALSE"; diff -urN oo_cvs_2004-01-01/scp/source/office/unxbasic.scp oo_welsh/scp/source/office/unxbasic.scp --- oo_cvs_2004-01-01/scp/source/office/unxbasic.scp 2003-12-17 20:51:43.000000000 +0000 +++ oo_welsh/scp/source/office/unxbasic.scp 2004-01-02 10:46:44.000000000 +0000 @@ -83,8 +83,6 @@ SiMsgBox(STR_BASIC_ADABASINST1#36 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#36) Case 37 SiMsgBox(STR_BASIC_ADABASINST1#37 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#37) - Case 50 - SiMsgBox(STR_BASIC_ADABASINST1#50 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#50) Case 39 SiMsgBox(STR_BASIC_ADABASINST1#39 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#39) Case 42 @@ -103,6 +101,10 @@ SiMsgBox(STR_BASIC_ADABASINST1#48 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#48) Case 49 SiMsgBox(STR_BASIC_ADABASINST1#49 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#49) + Case 50 + SiMsgBox(STR_BASIC_ADABASINST1#50 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#50) + Case 53 + SiMsgBox(STR_BASIC_ADABASINST1#53 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#53) Case 55 SiMsgBox(STR_BASIC_ADABASINST1#55 & Environ("DBROOT") & chr(13) & STR_BASIC_ADABASINST2#55) Case 66 @@ -160,8 +162,6 @@ SiMsgBox(STR_BASIC_ADABASPFAD#36) Case 37 SiMsgBox(STR_BASIC_ADABASPFAD#37) - Case 50 - SiMsgBox(STR_BASIC_ADABASPFAD#50) Case 39 SiMsgBox(STR_BASIC_ADABASPFAD#39) Case 42 @@ -180,6 +180,10 @@ SiMsgBox(STR_BASIC_ADABASPFAD#48) Case 49 SiMsgBox(STR_BASIC_ADABASPFAD#49) + Case 50 + SiMsgBox(STR_BASIC_ADABASPFAD#50) + Case 53 + SiMsgBox(STR_BASIC_ADABASPFAD#53) Case 55 SiMsgBox(STR_BASIC_ADABASPFAD#55) Case 66 @@ -552,7 +556,7 @@ dim isoresource as String dim newisoresource as String - countrynumber = 31 + countrynumber = 32 dim countrystrings(countrynumber) as String @@ -576,18 +580,19 @@ countrystrings(17) = "47" countrystrings(18) = "48" countrystrings(19) = "49" - countrystrings(20) = "55" - countrystrings(21) = "66" - countrystrings(22) = "77" - countrystrings(23) = "81" - countrystrings(24) = "82" - countrystrings(25) = "86" - countrystrings(26) = "88" - countrystrings(27) = "90" - countrystrings(28) = "91" - countrystrings(29) = "96" - countrystrings(30) = "97" - countrystrings(31) = "99" + countrystrings(20) = "53" + countrystrings(21) = "55" + countrystrings(22) = "66" + countrystrings(23) = "77" + countrystrings(24) = "81" + countrystrings(25) = "82" + countrystrings(26) = "86" + countrystrings(27) = "88" + countrystrings(28) = "90" + countrystrings(29) = "91" + countrystrings(30) = "96" + countrystrings(31) = "97" + countrystrings(32) = "99" resourcePath = DirEntry( GetSetupEnv.DestPath, "program", "resource" ) intVclNr = GetMajor() diff -urN oo_cvs_2004-01-01/scptools/source/linker/searchcache.cxx oo_welsh/scptools/source/linker/searchcache.cxx --- oo_cvs_2004-01-01/scptools/source/linker/searchcache.cxx 2003-12-17 15:57:16.000000000 +0000 +++ oo_welsh/scptools/source/linker/searchcache.cxx 2004-01-02 10:26:30.000000000 +0000 @@ -74,9 +74,9 @@ LanguageList aLanguageList; SearchOrderList aSearchOrderList; -#define ALL_LANG 28 +#define ALL_LANG 29 const char* ppAllLang[ALL_LANG] = { "01", "03", "07", "30", "31", "33", "34", "35", "36", "39", "42", "43", - "45", "46", "47", "48", "49", "50", "55", "77", "81", "82", "86", "88", "90", "96", "97", "99" }; + "45", "46", "47", "48", "49", "50", "53", "55", "77", "81", "82", "86", "88", "90", "96", "97", "99" }; /////////////////////////////////////////////////////////////////////////////// // search file include cache diff -urN oo_cvs_2004-01-01/scptools/source/linker/ziplst.cxx oo_welsh/scptools/source/linker/ziplst.cxx --- oo_cvs_2004-01-01/scptools/source/linker/ziplst.cxx 2003-12-17 15:57:49.000000000 +0000 +++ oo_welsh/scptools/source/linker/ziplst.cxx 2004-01-02 10:27:06.000000000 +0000 @@ -301,6 +301,7 @@ aStr.SearchAndReplaceAll( "48", "pl" ); aStr.SearchAndReplaceAll( "49", "de" ); aStr.SearchAndReplaceAll( "50", "sl" ); + aStr.SearchAndReplaceAll( "53", "cy" ); aStr.SearchAndReplaceAll( "55", "pt-BR" ); aStr.SearchAndReplaceAll( "77", "et" ); aStr.SearchAndReplaceAll( "81", "ja" ); diff -urN oo_cvs_2004-01-01/setup2/source/agenda/environ.cxx oo_welsh/setup2/source/agenda/environ.cxx --- oo_cvs_2004-01-01/setup2/source/agenda/environ.cxx 2003-12-17 17:16:21.000000000 +0000 +++ oo_welsh/setup2/source/agenda/environ.cxx 2004-01-02 10:18:05.000000000 +0000 @@ -272,12 +272,13 @@ case 31 : return ByteString("nl"); case 33 : return ByteString("fr"); case 34 : return ByteString("es"); - case 50 : return ByteString("sl"); case 39 : return ByteString("it"); case 45 : return ByteString("da"); case 46 : return ByteString("sv"); case 48 : return ByteString("pl"); case 49 : return ByteString("de"); + case 50 : return ByteString("sl"); + case 53 : return ByteString("cy"); case 77 : return ByteString("et"); case 81 : return ByteString("ja"); case 82 : return ByteString("ko"); diff -urN oo_cvs_2004-01-01/setup2/source/custom/tplsetup/tplsetup.cxx oo_welsh/setup2/source/custom/tplsetup/tplsetup.cxx --- oo_cvs_2004-01-01/setup2/source/custom/tplsetup/tplsetup.cxx 2003-12-17 17:20:02.000000000 +0000 +++ oo_welsh/setup2/source/custom/tplsetup/tplsetup.cxx 2004-01-02 10:20:41.000000000 +0000 @@ -255,6 +255,7 @@ #define REPLACEMENT_CHINESE_SIMPLIFIED ASCII_STR("chinese_simplified") #define REPLACEMENT_PORTUGUESE ASCII_STR("portuguese") #define REPLACEMENT_SLOVENIAN ASCII_STR("slovenian") +#define REPLACEMENT_WELSH ASCII_STR("welsh") //------------------------------------------------------------------------ @@ -346,7 +347,6 @@ case 35: return LANGUAGE_FINNISH; case 36: return LANGUAGE_HUNGARIAN; case 37: return LANGUAGE_CATALAN; - case 50: return LANGUAGE_SLOVENIAN; case 39: return LANGUAGE_ITALIAN; case 42: return LANGUAGE_CZECH; case 43: return LANGUAGE_SLOVAK; @@ -356,6 +356,8 @@ case 47: return LANGUAGE_NORWEGIAN; case 48: return LANGUAGE_POLISH; case 49: return LANGUAGE_GERMAN; + case 50: return LANGUAGE_SLOVENIAN; + case 53: return LANGUAGE_WELSH; case 55: return LANGUAGE_PORTUGUESE_BRAZILIAN; case 61: return LANGUAGE_ENGLISH_AUS; case 66: return LANGUAGE_THAI; @@ -1304,6 +1306,9 @@ case LANGUAGE_SLOVENIAN : aReplacement = REPLACEMENT_SLOVENIAN; break ; + case LANGUAGE_WELSH : aReplacement = REPLACEMENT_WELSH; + break ; + case LANGUAGE_SPANISH : case LANGUAGE_SPANISH_MEXICAN : case LANGUAGE_SPANISH_MODERN : diff -urN oo_cvs_2004-01-01/setup2/source/ui/pages/paddr.cxx oo_welsh/setup2/source/ui/pages/paddr.cxx --- oo_cvs_2004-01-01/setup2/source/ui/pages/paddr.cxx 2003-12-17 17:25:46.000000000 +0000 +++ oo_welsh/setup2/source/ui/pages/paddr.cxx 2004-01-02 10:21:59.000000000 +0000 @@ -358,6 +358,7 @@ case LANGUAGE_RUSSIAN: nIdx = RUSSISCHE_FOEDERATION; break; case LANGUAGE_SLOVAK: nIdx = SLOWAKEI; break; case LANGUAGE_SLOVENIAN: nIdx = SLOWENIEN; break; + case LANGUAGE_WELSH: nIdx = GROSSBRITANNIEN; break; case LANGUAGE_CHINESE_SIMPLIFIED: nIdx = CHINA; break; case LANGUAGE_JAPANESE: nIdx = JAPAN; break; case LANGUAGE_THAI: nIdx = THAILAND; break; diff -urN oo_cvs_2004-01-01/solenv/inc/postset.mk oo_welsh/solenv/inc/postset.mk --- oo_cvs_2004-01-01/solenv/inc/postset.mk 2003-12-17 18:05:43.000000000 +0000 +++ oo_welsh/solenv/inc/postset.mk 2004-01-02 10:17:22.000000000 +0000 @@ -413,6 +413,19 @@ RCLANGFLAGS_50+= -d SLOVENIAN iso_50=sl +.IF "$(RES_WELSH)"!="" || "$(give_me_all_languages)"!="" +alllangext+=53 +.ENDIF +completelangext+=53 +welsh$(LANG_GUI)*=$(default$(LANG_GUI)) +lang_53=welsh +longlang_53=welsh +langext_53=53 +rsclang_53=-lgWELSH +rescharset_53=$(welsh$(LANG_GUI)) +RCLANGFLAGS_53+= -d WELSH +iso_53=cy + .IF "$(RES_ESTONIAN)"!="" || "$(give_me_all_languages)"!="" alllangext+=77 .ENDIF diff -urN oo_cvs_2004-01-01/svtools/bmpmaker/bmpgui.cxx oo_welsh/svtools/bmpmaker/bmpgui.cxx --- oo_cvs_2004-01-01/svtools/bmpmaker/bmpgui.cxx 2003-12-17 20:25:24.000000000 +0000 +++ oo_welsh/svtools/bmpmaker/bmpgui.cxx 2004-01-02 10:06:54.000000000 +0000 @@ -112,6 +112,7 @@ { "korean", 82 }, { "turk", 90 }, { "slovenian", 50 } + { "welsh", 53 } }; // ---------- diff -urN oo_cvs_2004-01-01/sysui/oounix/office/cde/locales.tab oo_welsh/sysui/oounix/office/cde/locales.tab --- oo_cvs_2004-01-01/sysui/oounix/office/cde/locales.tab 2003-12-17 18:34:10.000000000 +0000 +++ oo_welsh/sysui/oounix/office/cde/locales.tab 2004-01-02 10:25:44.000000000 +0000 @@ -16,6 +16,7 @@ locales+=$(assign locale_48 = pl pl.UTF-8) locales+=$(assign locale_49 = de de.UTF-8) locales+=$(assign locale_50 = sl sl.UTF-8) +locales+=$(assign locale_53 = cy cy.UTF-8) locales+=$(assign locale_77 = et et.UTF-8) locales+=$(assign locale_81 = ja ja_JP.EUCJP ja_JP.PCK ja_JP.UTF-8) locales+=$(assign locale_82 = ko ko.UTF-8 ko_KR.EUC) diff -urN oo_cvs_2004-01-01/tools/source/rc/resmgr.cxx oo_welsh/tools/source/rc/resmgr.cxx --- oo_cvs_2004-01-01/tools/source/rc/resmgr.cxx 2003-12-17 19:25:19.000000000 +0000 +++ oo_welsh/tools/source/rc/resmgr.cxx 2004-01-02 10:23:17.000000000 +0000 @@ -1238,6 +1238,8 @@ return "42"; case LANGUAGE_SLOVENIAN: return "50"; + case LANGUAGE_WELSH: + return "53"; case LANGUAGE_HUNGARIAN: return "36"; case LANGUAGE_RUSSIAN: @@ -1397,6 +1399,7 @@ LANGUAGE_HUNGARIAN, LANGUAGE_CZECH, LANGUAGE_SLOVENIAN, + LANGUAGE_WELSH, LANGUAGE_SLOVAK, LANGUAGE_RUSSIAN, LANGUAGE_ARABIC, diff -urN oo_cvs_2004-01-01/transex3/inc/export.hxx oo_welsh/transex3/inc/export.hxx --- oo_cvs_2004-01-01/transex3/inc/export.hxx 2003-12-17 15:38:35.000000000 +0000 +++ oo_welsh/transex3/inc/export.hxx 2004-01-02 10:13:41.000000000 +0000 @@ -203,11 +203,15 @@ #define SLOVENIAN_ISO "sl" #define SLOVENIAN_INDEX 32 +#define WELSH 53 +#define WELSH_ISO "cy" +#define WELSH_INDEX 33 + // special language for l10n framework #define EXTERN 99 -#define EXTERN_INDEX 33 +#define EXTERN_INDEX 34 -#define LANGUAGES 34 +#define LANGUAGES 35 #define NO_TRANSLATE_ISO "x-no-translate" @@ -217,7 +221,8 @@ ( Export::LangId[ n ] == 34 ) || ( Export::LangId[ n ] == 35 ) || ( Export::LangId[ n ] == 37 ) || \ ( Export::LangId[ n ] == 36 ) || \ ( Export::LangId[ n ] == 39 ) || ( Export::LangId[ n ] == 45 ) || ( Export::LangId[ n ] == 46 ) || \ - ( Export::LangId[ n ] == 48 ) || ( Export::LangId[ n ] == 49 ) || ( Export::LangId[ n ] == 50 ) || ( Export::LangId[ n ] == 55 ) || \ + ( Export::LangId[ n ] == 48 ) || ( Export::LangId[ n ] == 49 ) || ( Export::LangId[ n ] == 50 ) || \ + ( Export::LangId[ n ] == 53 ) || ( Export::LangId[ n ] == 55 ) || \ ( Export::LangId[ n ] == 81 ) || ( Export::LangId[ n ] == 82 ) || ( Export::LangId[ n ] == 86 ) || \ ( Export::LangId[ n ] == 88 ) || ( Export::LangId[ n ] == 90 ) || ( Export::LangId[ n ] == 96 ) || \ ( Export::LangId[ n ] == 42 ) || ( Export::LangId[ n ] == 43 ) || ( Export::LangId[ n ] == 97 ) || \ diff -urN oo_cvs_2004-01-01/transex3/source/export.cxx oo_welsh/transex3/source/export.cxx --- oo_cvs_2004-01-01/transex3/source/export.cxx 2003-12-17 15:38:56.000000000 +0000 +++ oo_welsh/transex3/source/export.cxx 2004-01-02 10:14:13.000000000 +0000 @@ -1234,6 +1234,8 @@ return ESTONIAN_INDEX; else if ( sLang == "SLOVENIAN" ) return SLOVENIAN_INDEX; + else if ( sLang == "WELSH" ) + return WELSH_INDEX; else if ( sLang == "ENGLISH" ) return ENGLISH_INDEX; else if ( sLang == "DANISH" ) diff -urN oo_cvs_2004-01-01/transex3/source/export2.cxx oo_welsh/transex3/source/export2.cxx --- oo_cvs_2004-01-01/transex3/source/export2.cxx 2003-12-17 15:39:19.000000000 +0000 +++ oo_welsh/transex3/source/export2.cxx 2004-01-02 10:15:43.000000000 +0000 @@ -149,6 +149,7 @@ HINDI, ESTONIAN, SLOVENIAN, + WELSH, EXTERN }; @@ -206,6 +207,8 @@ return SLOVAK; else if ( sLang == ByteString( SLOVENIAN_ISO ).ToUpperAscii()) return SLOVENIAN; + else if ( sLang == ByteString( WELSH_ISO ).ToUpperAscii()) + return WELSH; else if ( sLang == ByteString( ENGLISH_ISO ).ToUpperAscii()) return ENGLISH; else if ( sLang == ByteString( DANISH_ISO ).ToUpperAscii()) @@ -285,6 +288,7 @@ case HINDI_INDEX: return HINDI_ISO; case ESTONIAN_INDEX: return ESTONIAN_ISO; case SLOVENIAN_INDEX: return SLOVENIAN_ISO; + case WELSH_INDEX: return WELSH_ISO; case EXTERN_INDEX: return sIsoCode99; } return ""; @@ -414,6 +418,7 @@ "hindi", "estonian", "slovenian", + "welsh", "extern" }; diff -urN oo_cvs_2004-01-01/transex3/source/merge.cxx oo_welsh/transex3/source/merge.cxx --- oo_cvs_2004-01-01/transex3/source/merge.cxx 2003-12-17 15:39:44.000000000 +0000 +++ oo_welsh/transex3/source/merge.cxx 2004-01-02 10:16:05.000000000 +0000 @@ -424,6 +424,7 @@ case HINDI: return HINDI_INDEX; case ESTONIAN: return ESTONIAN_INDEX; case SLOVENIAN: return SLOVENIAN_INDEX; + case WELSH: return WELSH_INDEX; case EXTERN: return EXTERN_INDEX; } return 0xFFFF;