diff options
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 22 | ||||
| -rwxr-xr-x | scp2/source/ooo/file_library_ooo.scp | 42 | ||||
| -rw-r--r-- | scp2/source/ooo/file_resource_ooo.scp | 2 | ||||
| -rwxr-xr-x | scp2/source/ooo/module_lang_template.scp | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/module_langpack.ulf | 32 |
5 files changed, 62 insertions, 39 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 7c306e19f427..899059ec26b1 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -98,7 +98,7 @@ Module gid_Module_Root_Brand gid_Brand_File_Share_Xdg_JavaFilter, gid_Brand_File_Share_Xdg_Math, gid_Brand_File_Share_Xdg_Printeradmin, - gid_Brand_File_Share_Xdg_QStart, +// gid_Brand_File_Share_Xdg_QStart, gid_Brand_File_Share_Xdg_StartCenter, gid_Brand_File_Share_Xdg_Writer, gid_Brand_File_Txt_Package); @@ -739,16 +739,16 @@ File gid_Brand_File_Share_Xdg_Printeradmin End #endif -#if defined UNX && ! defined MACOSX -#ifdef ENABLE_GTK -File gid_Brand_File_Share_Xdg_QStart - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Xdg; - Styles = (PACKED,SCPZIP_REPLACE); - Name = "qstart.desktop"; -End -#endif -#endif +//#if defined UNX && ! defined MACOSX +//#ifdef ENABLE_GTK +//File gid_Brand_File_Share_Xdg_QStart +// TXT_FILE_BODY; +// Dir = gid_Brand_Dir_Share_Xdg; +// Styles = (PACKED,SCPZIP_REPLACE); +// Name = "qstart.desktop"; +//End +//#endif +//#endif #if defined UNX && ! defined MACOSX File gid_Brand_File_Share_Xdg_Writer diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index cacfb19cad6b..228f70ee1391 100755 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -210,25 +210,25 @@ End #endif -#ifdef UNX -#ifdef ENABLE_GTK -#ifdef ENABLE_SYSTRAY_GTK -File gid_File_Lib_Egg_Tray - TXT_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - Name = STRING(CONCAT3(libeggtray,DLLPOSTFIX,UNXSUFFIX)); -End - -File gid_File_Lib_QStart_Gtk - Name = LIBNAME(qstart_gtk); - TXT_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; -End -#endif -#endif -#endif +//#ifdef UNX +//#ifdef ENABLE_GTK +//#ifdef ENABLE_SYSTRAY_GTK +//File gid_File_Lib_Egg_Tray +// TXT_FILE_BODY; +// Styles = (PACKED); +// Dir = SCP2_OOO_BIN_DIR; +// Name = STRING(CONCAT3(libeggtray,DLLPOSTFIX,UNXSUFFIX)); +//End +// +//File gid_File_Lib_QStart_Gtk +// Name = LIBNAME(qstart_gtk); +// TXT_FILE_BODY; +// Styles = (PACKED); +// Dir = SCP2_OOO_BIN_DIR; +//End +//#endif +//#endif +//#endif STD_LIB_FILE( gid_File_Lib_Dba, dba) @@ -355,9 +355,9 @@ File gid_File_Lib_Vbaswobj Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX - Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX)); + Name = STRING(CONCAT3(vbaswobj,.uno,UNXSUFFIX)); #else - Name = STRING(CONCAT4(vbaswobj,DLLPOSTFIX,.uno,.dll)); + Name = STRING(CONCAT3(vbaswobj,.uno,.dll)); #endif End diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index edaea2027944..cbd8ff609721 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -89,7 +89,7 @@ STD_RES_FILE( gid_File_Res_Spa, spa ) STD_RES_FILE( gid_File_Res_Stt, stt ) STD_RES_FILE( gid_File_Res_Sb, sb ) -STD_RES_FILE( gid_File_Res_Svs, svs ) +STD_RES_FILE( gid_File_Res_Svl, svl ) STD_RES_FILE( gid_File_Res_Svt, svt ) diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index a21016e409d3..0769df7ed214 100755 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -85,9 +85,8 @@ Module gid_Module_Langpack_Resource_Template gid_File_Res_Sd, gid_File_Res_Sfx, gid_File_Res_Spa, - gid_File_Res_Svs, + gid_File_Res_Svl, gid_File_Res_Svt, - gid_File_Res_Svp, gid_File_Res_Svx, gid_File_Res_Cui, gid_File_Res_TextConversionDlgs, diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index 3127cdd8b904..591c84a6a939 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -685,8 +685,32 @@ en-US = "Mongolian" [STR_DESC_MODULE_LANGPACK_MN] en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION" -[STR_NAME_MODULE_LANGPACK_MY] -en-US = "Burmese" +[STR_NAME_MODULE_LANGPACK_OC] +en-US = "Occitan" -[STR_DESC_MODULE_LANGPACK_MY] -en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION" +[STR_DESC_MODULE_LANGPACK_OC] +en-US = "Installs Occitan support in %PRODUCTNAME %PRODUCTVERSION" + +[STR_NAME_MODULE_LANGPACK_UG] +en-US = "Uighur" + +[STR_DESC_MODULE_LANGPACK_UG] +en-US = "Installs Uighur support in %PRODUCTNAME %PRODUCTVERSION" + +[STR_NAME_MODULE_LANGPACK_SI] +en-US = "Sinhala" + +[STR_DESC_MODULE_LANGPACK_SI] +en-US = "Installs Sinhala support in %PRODUCTNAME %PRODUCTVERSION" + +[STR_NAME_MODULE_LANGPACK_OM] +en-US = "Oromo" + +[STR_DESC_MODULE_LANGPACK_OM] +en-US = "Installs Oromo support in %PRODUCTNAME %PRODUCTVERSION" + +[STR_NAME_MODULE_LANGPACK_AST] +en-US = "Asturian" + +[STR_DESC_MODULE_LANGPACK_AST] +en-US = "Installs Asturian support in %PRODUCTNAME %PRODUCTVERSION" |