diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:04 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:04 +0200 |
commit | ca907e02205e8e99e28608ddfe7bdaca24f23aa4 (patch) | |
tree | afdf8fb6a8aef6920ad0f658bdad85c419e0c43e /scp2/source/accessories | |
parent | accumulate the output of modules in error in build_error.log (diff) | |
parent | Update .gitignore with the new modules. (diff) | |
download | core-ca907e02205e8e99e28608ddfe7bdaca24f23aa4.tar.gz core-ca907e02205e8e99e28608ddfe7bdaca24f23aa4.zip |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
Makefile.in
Repository.mk
autogen.sh
bin/lo-commit-stat
configure.in
distro-configs/LibreOfficeOpenBSD.conf
distro-configs/LibreOfficeWin32.conf
instsetoo_native/util/openoffice.lst
ooo.lst.in
scp2/source/ooo/module_langpack.ulf
set_soenv.in
solenv/bin/ooinstall
solenv/gbuild/CppunitTest.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.mk
solenv/gbuild/TargetLocations.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/solaris.mk
solenv/gbuild/platform/unxgcc.mk
solenv/gbuild/platform/windows.mk
solenv/inc/minor.mk
solenv/inc/settings.mk
tail_build/prj/makefile.mk
Diffstat (limited to 'scp2/source/accessories')
-rw-r--r-- | scp2/source/accessories/module_samples_accessories.ulf | 14 | ||||
-rw-r--r-- | scp2/source/accessories/module_templates_accessories.ulf | 14 |
2 files changed, 20 insertions, 8 deletions
diff --git a/scp2/source/accessories/module_samples_accessories.ulf b/scp2/source/accessories/module_samples_accessories.ulf index 42166a600afb..b6a0f5229786 100644 --- a/scp2/source/accessories/module_samples_accessories.ulf +++ b/scp2/source/accessories/module_samples_accessories.ulf @@ -284,10 +284,16 @@ en-US = "Lao" [STR_DESC_MODULE_LANGPACK_LO] en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION" -[STR_NAME_MODULE_LANGPACK_NS] +[STR_NAME_MODULE_LANGPACK_MY] +en-US = "Burmese" + +[STR_DESC_MODULE_LANGPACK_MY] +en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION" + +[STR_NAME_MODULE_LANGPACK_NSO] en-US = "Northern Sotho" -[STR_DESC_MODULE_LANGPACK_NS] +[STR_DESC_MODULE_LANGPACK_NSO] en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION" [STR_NAME_MODULE_LANGPACK_BN] @@ -428,10 +434,10 @@ en-US = "Ukrainian" [STR_DESC_MODULE_LANGPACK_UK] en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION" -[STR_NAME_MODULE_LANGPACK_BE_BY] +[STR_NAME_MODULE_LANGPACK_BE] en-US = "Belarusian" -[STR_DESC_MODULE_LANGPACK_BE_BY] +[STR_DESC_MODULE_LANGPACK_BE] en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION" [STR_NAME_MODULE_LANGPACK_SL] diff --git a/scp2/source/accessories/module_templates_accessories.ulf b/scp2/source/accessories/module_templates_accessories.ulf index 31411cb4743b..da17fc11244f 100644 --- a/scp2/source/accessories/module_templates_accessories.ulf +++ b/scp2/source/accessories/module_templates_accessories.ulf @@ -279,10 +279,16 @@ en-US = "Lao" [STR_DESC_MODULE_LANGPACK_LO] en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION" -[STR_NAME_MODULE_LANGPACK_NS] +[STR_NAME_MODULE_LANGPACK_MY] +en-US = "Burmese" + +[STR_DESC_MODULE_LANGPACK_MY] +en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION" + +[STR_NAME_MODULE_LANGPACK_NSO] en-US = "Northern Sotho" -[STR_DESC_MODULE_LANGPACK_NS] +[STR_DESC_MODULE_LANGPACK_NSO] en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION" [STR_NAME_MODULE_LANGPACK_BN] @@ -423,10 +429,10 @@ en-US = "Ukrainian" [STR_DESC_MODULE_LANGPACK_UK] en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION" -[STR_NAME_MODULE_LANGPACK_BE_BY] +[STR_NAME_MODULE_LANGPACK_BE] en-US = "Belarusian" -[STR_DESC_MODULE_LANGPACK_BE_BY] +[STR_DESC_MODULE_LANGPACK_BE] en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION" [STR_NAME_MODULE_LANGPACK_SL] |