diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-06-21 11:53:00 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-06-21 13:11:06 +0100 |
commit | b6db3e3acc6ba349d845ec58e3242d025352ef2f (patch) | |
tree | b371840f1594fc0a8c00550590153d89cfc4e1c6 /instsetoo_native | |
parent | re-work to test the effect of boost elision. (diff) | |
download | core-b6db3e3acc6ba349d845ec58e3242d025352ef2f.tar.gz core-b6db3e3acc6ba349d845ec58e3242d025352ef2f.zip |
re-base on ALv2 code.
Change-Id: Ice06e639213aeb6f7f23cbf4634947dd25613db1
Diffstat (limited to 'instsetoo_native')
5 files changed, 84 insertions, 21 deletions
diff --git a/instsetoo_native/inc_openoffice/unix/makefile.mk b/instsetoo_native/inc_openoffice/unix/makefile.mk index 3dec2ab1a09e..48f5cacab723 100644 --- a/instsetoo_native/inc_openoffice/unix/makefile.mk +++ b/instsetoo_native/inc_openoffice/unix/makefile.mk @@ -1,29 +1,20 @@ -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This file is part of the LibreOffice project. # -# OpenOffice.org - a multi-platform office productivity suite +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# This file is part of OpenOffice.org. +# This file incorporates work covered by the following license notice: # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* PRJ=..$/.. diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf index e62f26c6eba1..a69af2544bfd 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf @@ -1,3 +1,21 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + [OOO_ACTIONTEXT_1] en-US = "Advertising application" diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf index a5371150465d..a14f45e0cd54 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf @@ -1,3 +1,21 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + [OOO_ERROR_1] en-US = "{{Fatal error: }}" diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf index 24b51774bacb..e3115581f3c3 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf @@ -1,3 +1,21 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + [OOO_RADIOBUTTON_1] en-US = "{&MSSansBold8}&Modify" diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/UIText.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/UIText.ulf index a00f70ac6d7f..3775dac84834 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/UIText.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/UIText.ulf @@ -1,3 +1,21 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + [OOO_UITEXT_1] en-US = "bytes" |