diff options
Diffstat (limited to 'sysui')
106 files changed, 387 insertions, 186 deletions
diff --git a/sysui/desktop/debian/postinst b/sysui/desktop/debian/postinst index 531251215fe2..11f4458e1428 100755 --- a/sysui/desktop/debian/postinst +++ b/sysui/desktop/debian/postinst @@ -111,6 +111,7 @@ application/vnd.sun.xml.writer.template; %PREFIX -view %s application/vnd.sun.xml.writer.global; %PREFIX -view %s application/vnd.stardivision.writer; %PREFIX -view %s application/vnd.stardivision.writer-global; %PREFIX -view %s +application/x-hwp; %PREFIX -view %s application/x-starwriter; %PREFIX -view %s application/vnd.oasis.opendocument.formula; %PREFIX -view %s application/vnd.sun.xml.math; %PREFIX -view %s @@ -154,6 +155,7 @@ application/vnd.writerperfect; %PREFIX -view %s application/wordperfect5.1; %PREFIX -view %s application/x-wordperfect; %PREFIX -view %s application/wordperfect; %PREFIX -view %s +application/vnd.lotus-wordpro; %PREFIX -view %s application/wpwin; %PREFIX -view %s application/vnd.openofficeorg.extension; %PREFIX %s END diff --git a/sysui/desktop/man/libreoffice.1 b/sysui/desktop/man/libreoffice.1 index ee814cf3ca28..06c4cab0f931 100644 --- a/sysui/desktop/man/libreoffice.1 +++ b/sysui/desktop/man/libreoffice.1 @@ -122,7 +122,7 @@ or the kill command (UNIX based systems). .TP \fB\-infilter="<filter>"\fR Force an input filter type if possible. -For example -infilter="Calc Office Open XML" only +For example -infilter="Calc Office Open XML" only .TP \fB\-math\fR diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop index 40f7e79ebc8c..dbbff82a9144 100755 --- a/sysui/desktop/menus/base.desktop +++ b/sysui/desktop/menus/base.desktop @@ -7,7 +7,6 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-MoreApplicat Exec=${UNIXBASISROOTNAME} --base %U MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base; Name=%PRODUCTNAME Base -Name[pt_BR]=%PRODUCTNAME_BR Base GenericName=Database Development Comment=Manage databases, create queries and reports to track and manage your information by using Base. InitialPreference=5 diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop index 80cc09ddbedb..696385aba18a 100755 --- a/sysui/desktop/menus/calc.desktop +++ b/sysui/desktop/menus/calc.desktop @@ -5,9 +5,8 @@ Icon=calc Type=Application Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets; Exec=${UNIXBASISROOTNAME} --calc %U -MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf; +MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet; Name=%PRODUCTNAME Calc -Name[pt_BR]=%PRODUCTNAME_BR Calc GenericName=Spreadsheet -Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc. +Comment=Perform calculations, analyze information and manage lists in spreadsheets by using Calc. InitialPreference=5 diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop index 57f7ade0aea4..96234c67147a 100755 --- a/sysui/desktop/menus/draw.desktop +++ b/sysui/desktop/menus/draw.desktop @@ -7,7 +7,6 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawi Exec=${UNIXBASISROOTNAME} --draw %U MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw; Name=%PRODUCTNAME Draw -Name[pt_BR]=%PRODUCTNAME_BR Draw GenericName=Drawing Program Comment=Create and edit drawings, flow charts, and logos by using Draw. InitialPreference=5 diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop index 025524e17984..92060e37800d 100755 --- a/sysui/desktop/menus/impress.desktop +++ b/sysui/desktop/menus/impress.desktop @@ -7,7 +7,6 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Prese Exec=${UNIXBASISROOTNAME} --impress %U MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12; Name=%PRODUCTNAME Impress -Name[pt_BR]=%PRODUCTNAME_BR Impress GenericName=Presentation Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress. InitialPreference=5 diff --git a/sysui/desktop/menus/javafilter.desktop b/sysui/desktop/menus/javafilter.desktop index 8b9c30a2f70f..61e4ea7e3340 100755 --- a/sysui/desktop/menus/javafilter.desktop +++ b/sysui/desktop/menus/javafilter.desktop @@ -5,6 +5,5 @@ Type=Application Exec=${UNIXBASISROOTNAME} --writer %U MimeType=application/x-aportisdoc;application/x-pocket-word;application/x-pocket-excel; Name=%PRODUCTNAME Small Device Format Importer -Name[pt_BR]=%PRODUCTNAME_BR Small Device Format Importer GenericName=Small Device Format Importer NoDisplay=true diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop index 55fcc29f312d..7b2e9807cb04 100755 --- a/sysui/desktop/menus/math.desktop +++ b/sysui/desktop/menus/math.desktop @@ -7,7 +7,6 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other Exec=${UNIXBASISROOTNAME} --math %U MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math; Name=%PRODUCTNAME Math -Name[pt_BR]=%PRODUCTNAME_BR Math GenericName=Formula Editor Comment=Create and edit scientific formulas and equations by using Math. InitialPreference=5 diff --git a/sysui/desktop/menus/printeradmin.desktop b/sysui/desktop/menus/printeradmin.desktop index 3da4d82a33b1..2d4747605267 100755 --- a/sysui/desktop/menus/printeradmin.desktop +++ b/sysui/desktop/menus/printeradmin.desktop @@ -6,5 +6,4 @@ Type=Application Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office; Exec=${UNIXBASISROOTNAME}-printeradmin Name=%PRODUCTNAME Printer Administration -Name[pt_BR]=%PRODUCTNAME_BR Printer Administration diff --git a/sysui/desktop/menus/qstart.desktop b/sysui/desktop/menus/qstart.desktop index 52ac185b9d3f..fc39c227ade7 100755 --- a/sysui/desktop/menus/qstart.desktop +++ b/sysui/desktop/menus/qstart.desktop @@ -6,5 +6,4 @@ Categories=Office; Exec=${UNIXBASISROOTNAME} --quickstart --nologo --nodefault NoDisplay=true Name=%PRODUCTNAME Quickstarter -Name[pt_BR]=%PRODUCTNAME_BR Quickstarter Comment=Hook for quickstarter startup diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop index 390dd93f3a0a..0c6d0a1eb8cd 100755 --- a/sysui/desktop/menus/startcenter.desktop +++ b/sysui/desktop/menus/startcenter.desktop @@ -7,6 +7,5 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other Exec=${UNIXBASISROOTNAME} %U MimeType=application/vnd.openofficeorg.extension; Name=%PRODUCTNAME -Name[pt_BR]=%PRODUCTNAME_BR GenericName=Office Comment=The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation. diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop index 2222019bbf55..625df59ca117 100755 --- a/sysui/desktop/menus/writer.desktop +++ b/sysui/desktop/menus/writer.desktop @@ -5,9 +5,8 @@ Icon=writer Type=Application Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors; Exec=${UNIXBASISROOTNAME} --writer %U -MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12; +MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12; Name=%PRODUCTNAME Writer -Name[pt_BR]=%PRODUCTNAME_BR Writer GenericName=Word Processor Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. InitialPreference=5 diff --git a/sysui/desktop/mimetypes/openoffice.applications b/sysui/desktop/mimetypes/openoffice.applications index 6d878010e214..26a34947b09c 100755 --- a/sysui/desktop/mimetypes/openoffice.applications +++ b/sysui/desktop/mimetypes/openoffice.applications @@ -5,5 +5,5 @@ OFFICENAME expects_uris=true requires_terminal=false uses_gnomevfs=true - mime_types=application/vnd.oasis.opendocument.text,application/vnd.oasis.opendocument.text-flat-xml,application/vnd.oasis.opendocument.text-template,application/vnd.oasis.opendocument.text-web,application/vnd.oasis.opendocument.text-master,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-flat-xml,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-flat-xml,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-flat-xml,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.database,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,application/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.base,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict;application/vnd.wordperfect;application/vnd.openofficeorg.extension;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12; + mime_types=application/vnd.oasis.opendocument.text,application/vnd.oasis.opendocument.text-flat-xml,application/vnd.oasis.opendocument.text-template,application/vnd.oasis.opendocument.text-web,application/vnd.oasis.opendocument.text-master,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-flat-xml,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-flat-xml,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-flat-xml,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.database,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,application/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.base,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict;application/vnd.wordperfect;application/vnd.lotus-wordpro;application/vnd.openofficeorg.extension;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;application/x-hwp;text/spreadsheet; diff --git a/sysui/desktop/os2/makefile.mk b/sysui/desktop/os2/makefile.mk deleted file mode 100755 index 7d1637254a01..000000000000 --- a/sysui/desktop/os2/makefile.mk +++ /dev/null @@ -1,123 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# 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. -# -# 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=..$/.. - -PRJNAME=sysui -TARGET=icons - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Targets ------------------------------------------------------------- - -all: \ - $(MISC)$/ooo-base-app.ico \ - $(MISC)$/ooo-base-doc.ico \ - $(MISC)$/ooo-calc-app.ico \ - $(MISC)$/ooo-calc-doc.ico \ - $(MISC)$/ooo-calc-tem.ico \ - $(MISC)$/ooo-chart-doc.ico \ - $(MISC)$/ooo-configuration.ico \ - $(MISC)$/ooo-draw-app.ico \ - $(MISC)$/ooo-draw-doc.ico \ - $(MISC)$/ooo-draw-tem.ico \ - $(MISC)$/ooo-empty-doc.ico \ - $(MISC)$/ooo-empty-tem.ico \ - $(MISC)$/ooo-image-doc.ico \ - $(MISC)$/ooo-impress-app.ico \ - $(MISC)$/ooo-impress-doc.ico \ - $(MISC)$/ooo-impress-tem.ico \ - $(MISC)$/ooo-macro-doc.ico \ - $(MISC)$/ooo-main-app.ico \ - $(MISC)$/ooo-master-doc.ico \ - $(MISC)$/ooo-math-app.ico \ - $(MISC)$/ooo-math-doc.ico \ - $(MISC)$/ooo-open.ico \ - $(MISC)$/ooo-printer.ico \ - $(MISC)$/ooo-web-doc.ico \ - $(MISC)$/ooo-writer-app.ico \ - $(MISC)$/ooo-writer-doc.ico \ - $(MISC)$/ooo-writer-tem.ico \ - $(MISC)$/ooo11-base-doc.ico \ - $(MISC)$/ooo11-calc-doc.ico \ - $(MISC)$/ooo11-calc-tem.ico \ - $(MISC)$/ooo11-chart-doc.ico \ - $(MISC)$/ooo11-draw-doc.ico \ - $(MISC)$/ooo11-draw-tem.ico \ - $(MISC)$/ooo11-impress-doc.ico \ - $(MISC)$/ooo11-impress-tem.ico \ - $(MISC)$/ooo11-master-doc.ico \ - $(MISC)$/ooo11-math-doc.ico \ - $(MISC)$/ooo11-writer-doc.ico \ - $(MISC)$/ooo11-writer-tem.ico \ - $(MISC)$/so8-base-app.ico \ - $(MISC)$/so8-base-doc.ico \ - $(MISC)$/so8-calc-app.ico \ - $(MISC)$/so8-calc-doc.ico \ - $(MISC)$/so8-calc-tem.ico \ - $(MISC)$/so8-chart-doc.ico \ - $(MISC)$/so8-configuration.ico \ - $(MISC)$/so8-draw-app.ico \ - $(MISC)$/so8-draw-doc.ico \ - $(MISC)$/so8-draw-tem.ico \ - $(MISC)$/so8-empty-doc.ico \ - $(MISC)$/so8-empty-tem.ico \ - $(MISC)$/so8-image-doc.ico \ - $(MISC)$/so8-impress-app.ico \ - $(MISC)$/so8-impress-doc.ico \ - $(MISC)$/so8-impress-tem.ico \ - $(MISC)$/so8-macro-doc.ico \ - $(MISC)$/so8-main-app.ico \ - $(MISC)$/so8-master-doc.ico \ - $(MISC)$/so8-math-app.ico \ - $(MISC)$/so8-math-doc.ico \ - $(MISC)$/so8-open.ico \ - $(MISC)$/so8-printer.ico \ - $(MISC)$/so8-web-doc.ico \ - $(MISC)$/so8-writer-app.ico \ - $(MISC)$/so8-writer-doc.ico \ - $(MISC)$/so8-writer-tem.ico \ - $(MISC)$/so7-base-doc.ico \ - $(MISC)$/so7-calc-doc.ico \ - $(MISC)$/so7-calc-tem.ico \ - $(MISC)$/so7-chart-doc.ico \ - $(MISC)$/so7-draw-doc.ico \ - $(MISC)$/so7-draw-tem.ico \ - $(MISC)$/so7-impress-doc.ico \ - $(MISC)$/so7-impress-tem.ico \ - $(MISC)$/so7-master-doc.ico \ - $(MISC)$/so7-math-doc.ico \ - $(MISC)$/so7-writer-doc.ico \ - $(MISC)$/so7-writer-tem.ico - -$(MISC)$/%.ico: %.ico - +$(COPY) $< $@ - -.INCLUDE : target.mk - diff --git a/sysui/desktop/os2/ooo-base-app.ico b/sysui/desktop/os2/ooo-base-app.ico Binary files differdeleted file mode 100644 index e55abae34476..000000000000 --- a/sysui/desktop/os2/ooo-base-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-base-doc.ico b/sysui/desktop/os2/ooo-base-doc.ico Binary files differdeleted file mode 100644 index e1b033ad1050..000000000000 --- a/sysui/desktop/os2/ooo-base-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-calc-app.ico b/sysui/desktop/os2/ooo-calc-app.ico Binary files differdeleted file mode 100644 index 66adbc663516..000000000000 --- a/sysui/desktop/os2/ooo-calc-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-calc-doc.ico b/sysui/desktop/os2/ooo-calc-doc.ico Binary files differdeleted file mode 100644 index 0cfc09f9c9f1..000000000000 --- a/sysui/desktop/os2/ooo-calc-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-calc-tem.ico b/sysui/desktop/os2/ooo-calc-tem.ico Binary files differdeleted file mode 100644 index 363703e35369..000000000000 --- a/sysui/desktop/os2/ooo-calc-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-chart-doc.ico b/sysui/desktop/os2/ooo-chart-doc.ico Binary files differdeleted file mode 100644 index fee582f29d49..000000000000 --- a/sysui/desktop/os2/ooo-chart-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-configuration.ico b/sysui/desktop/os2/ooo-configuration.ico Binary files differdeleted file mode 100644 index 2723b37fcb8e..000000000000 --- a/sysui/desktop/os2/ooo-configuration.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-draw-app.ico b/sysui/desktop/os2/ooo-draw-app.ico Binary files differdeleted file mode 100644 index 1524d9989566..000000000000 --- a/sysui/desktop/os2/ooo-draw-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-draw-doc.ico b/sysui/desktop/os2/ooo-draw-doc.ico Binary files differdeleted file mode 100644 index a63a39b787cf..000000000000 --- a/sysui/desktop/os2/ooo-draw-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-draw-tem.ico b/sysui/desktop/os2/ooo-draw-tem.ico Binary files differdeleted file mode 100644 index cac9513cb3c2..000000000000 --- a/sysui/desktop/os2/ooo-draw-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-empty-doc.ico b/sysui/desktop/os2/ooo-empty-doc.ico Binary files differdeleted file mode 100644 index 350e6ac37da3..000000000000 --- a/sysui/desktop/os2/ooo-empty-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-empty-tem.ico b/sysui/desktop/os2/ooo-empty-tem.ico Binary files differdeleted file mode 100644 index 3cdff3d8c73a..000000000000 --- a/sysui/desktop/os2/ooo-empty-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-image-doc.ico b/sysui/desktop/os2/ooo-image-doc.ico Binary files differdeleted file mode 100644 index b1fed4dca8da..000000000000 --- a/sysui/desktop/os2/ooo-image-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-impress-app.ico b/sysui/desktop/os2/ooo-impress-app.ico Binary files differdeleted file mode 100644 index e58eaad5cdc9..000000000000 --- a/sysui/desktop/os2/ooo-impress-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-impress-doc.ico b/sysui/desktop/os2/ooo-impress-doc.ico Binary files differdeleted file mode 100644 index ba1b6df74e33..000000000000 --- a/sysui/desktop/os2/ooo-impress-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-impress-tem.ico b/sysui/desktop/os2/ooo-impress-tem.ico Binary files differdeleted file mode 100644 index 93a3509ad5fe..000000000000 --- a/sysui/desktop/os2/ooo-impress-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-macro-doc.ico b/sysui/desktop/os2/ooo-macro-doc.ico Binary files differdeleted file mode 100644 index 2fe6c55f581e..000000000000 --- a/sysui/desktop/os2/ooo-macro-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-main-app.ico b/sysui/desktop/os2/ooo-main-app.ico Binary files differdeleted file mode 100644 index f7edd4524bc1..000000000000 --- a/sysui/desktop/os2/ooo-main-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-master-doc.ico b/sysui/desktop/os2/ooo-master-doc.ico Binary files differdeleted file mode 100644 index 2861de24d1c4..000000000000 --- a/sysui/desktop/os2/ooo-master-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-math-app.ico b/sysui/desktop/os2/ooo-math-app.ico Binary files differdeleted file mode 100644 index c3c3c81c9106..000000000000 --- a/sysui/desktop/os2/ooo-math-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-math-doc.ico b/sysui/desktop/os2/ooo-math-doc.ico Binary files differdeleted file mode 100644 index a605e9e1ae0e..000000000000 --- a/sysui/desktop/os2/ooo-math-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-open.ico b/sysui/desktop/os2/ooo-open.ico Binary files differdeleted file mode 100644 index 508909ea3815..000000000000 --- a/sysui/desktop/os2/ooo-open.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-printer.ico b/sysui/desktop/os2/ooo-printer.ico Binary files differdeleted file mode 100644 index 30ed6cd00ccc..000000000000 --- a/sysui/desktop/os2/ooo-printer.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-web-doc.ico b/sysui/desktop/os2/ooo-web-doc.ico Binary files differdeleted file mode 100644 index d8b497633528..000000000000 --- a/sysui/desktop/os2/ooo-web-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-writer-app.ico b/sysui/desktop/os2/ooo-writer-app.ico Binary files differdeleted file mode 100644 index c6a5e1fdfc7f..000000000000 --- a/sysui/desktop/os2/ooo-writer-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-writer-doc.ico b/sysui/desktop/os2/ooo-writer-doc.ico Binary files differdeleted file mode 100644 index 02a95ecee479..000000000000 --- a/sysui/desktop/os2/ooo-writer-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo-writer-tem.ico b/sysui/desktop/os2/ooo-writer-tem.ico Binary files differdeleted file mode 100644 index b356cffbdcbf..000000000000 --- a/sysui/desktop/os2/ooo-writer-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-base-doc.ico b/sysui/desktop/os2/ooo11-base-doc.ico Binary files differdeleted file mode 100644 index dda0cba1e22f..000000000000 --- a/sysui/desktop/os2/ooo11-base-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-calc-doc.ico b/sysui/desktop/os2/ooo11-calc-doc.ico Binary files differdeleted file mode 100644 index d891a04c869a..000000000000 --- a/sysui/desktop/os2/ooo11-calc-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-calc-tem.ico b/sysui/desktop/os2/ooo11-calc-tem.ico Binary files differdeleted file mode 100644 index d891a04c869a..000000000000 --- a/sysui/desktop/os2/ooo11-calc-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-chart-doc.ico b/sysui/desktop/os2/ooo11-chart-doc.ico Binary files differdeleted file mode 100644 index dda0cba1e22f..000000000000 --- a/sysui/desktop/os2/ooo11-chart-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-draw-doc.ico b/sysui/desktop/os2/ooo11-draw-doc.ico Binary files differdeleted file mode 100644 index 61312fbe562e..000000000000 --- a/sysui/desktop/os2/ooo11-draw-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-draw-tem.ico b/sysui/desktop/os2/ooo11-draw-tem.ico Binary files differdeleted file mode 100644 index 61312fbe562e..000000000000 --- a/sysui/desktop/os2/ooo11-draw-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-impress-doc.ico b/sysui/desktop/os2/ooo11-impress-doc.ico Binary files differdeleted file mode 100644 index cebf5e56bc77..000000000000 --- a/sysui/desktop/os2/ooo11-impress-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-impress-tem.ico b/sysui/desktop/os2/ooo11-impress-tem.ico Binary files differdeleted file mode 100644 index cebf5e56bc77..000000000000 --- a/sysui/desktop/os2/ooo11-impress-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-master-doc.ico b/sysui/desktop/os2/ooo11-master-doc.ico Binary files differdeleted file mode 100644 index dda0cba1e22f..000000000000 --- a/sysui/desktop/os2/ooo11-master-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-math-doc.ico b/sysui/desktop/os2/ooo11-math-doc.ico Binary files differdeleted file mode 100644 index ab8c16007727..000000000000 --- a/sysui/desktop/os2/ooo11-math-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-writer-doc.ico b/sysui/desktop/os2/ooo11-writer-doc.ico Binary files differdeleted file mode 100644 index 901d8ec3df33..000000000000 --- a/sysui/desktop/os2/ooo11-writer-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/ooo11-writer-tem.ico b/sysui/desktop/os2/ooo11-writer-tem.ico Binary files differdeleted file mode 100644 index 901d8ec3df33..000000000000 --- a/sysui/desktop/os2/ooo11-writer-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-base-doc.ico b/sysui/desktop/os2/so7-base-doc.ico Binary files differdeleted file mode 100644 index 5ffd7549cc5b..000000000000 --- a/sysui/desktop/os2/so7-base-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-calc-doc.ico b/sysui/desktop/os2/so7-calc-doc.ico Binary files differdeleted file mode 100644 index ead58e51ff6d..000000000000 --- a/sysui/desktop/os2/so7-calc-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-calc-tem.ico b/sysui/desktop/os2/so7-calc-tem.ico Binary files differdeleted file mode 100644 index bdbeb0406ccd..000000000000 --- a/sysui/desktop/os2/so7-calc-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-chart-doc.ico b/sysui/desktop/os2/so7-chart-doc.ico Binary files differdeleted file mode 100644 index 5412287c37ea..000000000000 --- a/sysui/desktop/os2/so7-chart-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-draw-doc.ico b/sysui/desktop/os2/so7-draw-doc.ico Binary files differdeleted file mode 100644 index 3e4ab098070d..000000000000 --- a/sysui/desktop/os2/so7-draw-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-draw-tem.ico b/sysui/desktop/os2/so7-draw-tem.ico Binary files differdeleted file mode 100644 index ca46a39a5f21..000000000000 --- a/sysui/desktop/os2/so7-draw-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-impress-doc.ico b/sysui/desktop/os2/so7-impress-doc.ico Binary files differdeleted file mode 100644 index 4df2d73d3c23..000000000000 --- a/sysui/desktop/os2/so7-impress-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-impress-tem.ico b/sysui/desktop/os2/so7-impress-tem.ico Binary files differdeleted file mode 100644 index 0c29d09ebf53..000000000000 --- a/sysui/desktop/os2/so7-impress-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-master-doc.ico b/sysui/desktop/os2/so7-master-doc.ico Binary files differdeleted file mode 100644 index 70a7fa52afe7..000000000000 --- a/sysui/desktop/os2/so7-master-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-math-doc.ico b/sysui/desktop/os2/so7-math-doc.ico Binary files differdeleted file mode 100644 index 9e1f3bb4dbf2..000000000000 --- a/sysui/desktop/os2/so7-math-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-writer-doc.ico b/sysui/desktop/os2/so7-writer-doc.ico Binary files differdeleted file mode 100644 index 01e1fcc897bf..000000000000 --- a/sysui/desktop/os2/so7-writer-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so7-writer-tem.ico b/sysui/desktop/os2/so7-writer-tem.ico Binary files differdeleted file mode 100644 index c6bc74e0e2e3..000000000000 --- a/sysui/desktop/os2/so7-writer-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-base-app.ico b/sysui/desktop/os2/so8-base-app.ico Binary files differdeleted file mode 100644 index 8480d3cf506f..000000000000 --- a/sysui/desktop/os2/so8-base-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-base-doc.ico b/sysui/desktop/os2/so8-base-doc.ico Binary files differdeleted file mode 100644 index c539d1f4a773..000000000000 --- a/sysui/desktop/os2/so8-base-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-calc-app.ico b/sysui/desktop/os2/so8-calc-app.ico Binary files differdeleted file mode 100644 index fc129ca9771d..000000000000 --- a/sysui/desktop/os2/so8-calc-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-calc-doc.ico b/sysui/desktop/os2/so8-calc-doc.ico Binary files differdeleted file mode 100644 index b5184ff419aa..000000000000 --- a/sysui/desktop/os2/so8-calc-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-calc-tem.ico b/sysui/desktop/os2/so8-calc-tem.ico Binary files differdeleted file mode 100644 index 6c6b6dbbd44e..000000000000 --- a/sysui/desktop/os2/so8-calc-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-chart-doc.ico b/sysui/desktop/os2/so8-chart-doc.ico Binary files differdeleted file mode 100644 index a3b8ae3c0a1a..000000000000 --- a/sysui/desktop/os2/so8-chart-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-configuration.ico b/sysui/desktop/os2/so8-configuration.ico Binary files differdeleted file mode 100644 index eebd9d899aac..000000000000 --- a/sysui/desktop/os2/so8-configuration.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-draw-app.ico b/sysui/desktop/os2/so8-draw-app.ico Binary files differdeleted file mode 100644 index c491094c5faa..000000000000 --- a/sysui/desktop/os2/so8-draw-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-draw-doc.ico b/sysui/desktop/os2/so8-draw-doc.ico Binary files differdeleted file mode 100644 index 28d1b32e161e..000000000000 --- a/sysui/desktop/os2/so8-draw-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-draw-tem.ico b/sysui/desktop/os2/so8-draw-tem.ico Binary files differdeleted file mode 100644 index caf6ddc8c94d..000000000000 --- a/sysui/desktop/os2/so8-draw-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-empty-doc.ico b/sysui/desktop/os2/so8-empty-doc.ico Binary files differdeleted file mode 100644 index 23b1bfa00843..000000000000 --- a/sysui/desktop/os2/so8-empty-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-empty-tem.ico b/sysui/desktop/os2/so8-empty-tem.ico Binary files differdeleted file mode 100644 index 08d0ff03730b..000000000000 --- a/sysui/desktop/os2/so8-empty-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-image-doc.ico b/sysui/desktop/os2/so8-image-doc.ico Binary files differdeleted file mode 100644 index 2c734453e638..000000000000 --- a/sysui/desktop/os2/so8-image-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-impress-app.ico b/sysui/desktop/os2/so8-impress-app.ico Binary files differdeleted file mode 100644 index f77ba1d055d0..000000000000 --- a/sysui/desktop/os2/so8-impress-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-impress-doc.ico b/sysui/desktop/os2/so8-impress-doc.ico Binary files differdeleted file mode 100644 index 9bf3ea37f130..000000000000 --- a/sysui/desktop/os2/so8-impress-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-impress-tem.ico b/sysui/desktop/os2/so8-impress-tem.ico Binary files differdeleted file mode 100644 index fe6a1ffbc61d..000000000000 --- a/sysui/desktop/os2/so8-impress-tem.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-macro-doc.ico b/sysui/desktop/os2/so8-macro-doc.ico Binary files differdeleted file mode 100644 index e828c0cd7afa..000000000000 --- a/sysui/desktop/os2/so8-macro-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-main-app.ico b/sysui/desktop/os2/so8-main-app.ico Binary files differdeleted file mode 100644 index d158dd3bdbda..000000000000 --- a/sysui/desktop/os2/so8-main-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-master-doc.ico b/sysui/desktop/os2/so8-master-doc.ico Binary files differdeleted file mode 100644 index 1b2ba16e5d45..000000000000 --- a/sysui/desktop/os2/so8-master-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-math-app.ico b/sysui/desktop/os2/so8-math-app.ico Binary files differdeleted file mode 100644 index 0299bedde70e..000000000000 --- a/sysui/desktop/os2/so8-math-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-math-doc.ico b/sysui/desktop/os2/so8-math-doc.ico Binary files differdeleted file mode 100644 index cacbcd977732..000000000000 --- a/sysui/desktop/os2/so8-math-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-open.ico b/sysui/desktop/os2/so8-open.ico Binary files differdeleted file mode 100644 index 6dcee498e5e6..000000000000 --- a/sysui/desktop/os2/so8-open.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-printer.ico b/sysui/desktop/os2/so8-printer.ico Binary files differdeleted file mode 100644 index 49780f9cc7b9..000000000000 --- a/sysui/desktop/os2/so8-printer.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-web-doc.ico b/sysui/desktop/os2/so8-web-doc.ico Binary files differdeleted file mode 100644 index 15a4d860c58d..000000000000 --- a/sysui/desktop/os2/so8-web-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-writer-app.ico b/sysui/desktop/os2/so8-writer-app.ico Binary files differdeleted file mode 100644 index 9b36afd75534..000000000000 --- a/sysui/desktop/os2/so8-writer-app.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-writer-doc.ico b/sysui/desktop/os2/so8-writer-doc.ico Binary files differdeleted file mode 100644 index 12bc54839cfc..000000000000 --- a/sysui/desktop/os2/so8-writer-doc.ico +++ /dev/null diff --git a/sysui/desktop/os2/so8-writer-tem.ico b/sysui/desktop/os2/so8-writer-tem.ico Binary files differdeleted file mode 100644 index ff1a9fe2e220..000000000000 --- a/sysui/desktop/os2/so8-writer-tem.ico +++ /dev/null diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk index 0b027a44ccf1..2e581d0f5107 100755 --- a/sysui/desktop/productversion.mk +++ b/sysui/desktop/productversion.mk @@ -65,13 +65,6 @@ PKGVERSION.libreoffice = $(PKGVERSION) UNIXFILENAME.libreoffice = $(PRODUCTNAME.libreoffice:l)$(PRODUCTVERSION.libreoffice) ICONPREFIX.libreoffice = $(UNIXFILENAME.libreoffice:s/.//g) -PRODUCTNAME.broffice = BrOffice -PRODUCTVERSION.broffice = $(PRODUCTVERSION) -PRODUCTVERSIONSHORT.broffice = $(PRODUCTVERSIONSHORT) -PKGVERSION.broffice = $(PKGVERSION) -UNIXFILENAME.broffice = $(PRODUCTNAME.broffice:l)$(PRODUCTVERSION.broffice) -ICONPREFIX.broffice = $(UNIXFILENAME.broffice:s/.//g) - PRODUCTNAME.oxygenoffice = OxygenOffice PRODUCTVERSION.oxygenoffice = $(PRODUCTVERSION) PRODUCTVERSIONSHORT.oxygenoffice = $(PRODUCTVERSIONSHORT) diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec index aa7249793537..7cb6370f2837 100755 --- a/sysui/desktop/redhat/redhat-menus.spec +++ b/sysui/desktop/redhat/redhat-menus.spec @@ -268,6 +268,7 @@ application/vnd.writerperfect; %unixfilename -view %s application/wordperfect5.1; %unixfilename -view %s application/x-wordperfect; %unixfilename -view %s application/wordperfect; %unixfilename -view %s +application/vnd.lotus-wordpro; %unixfilename -view %s application/wpwin; %unixfilename -view %s application/vnd.openofficeorg.extension; %unixfilename %s application/vnd.openxmlformats-officedocument.wordprocessingml.document; %unixfilename -view %s @@ -282,6 +283,7 @@ application/vnd.openxmlformats-officedocument.presentationml.presentation; %unix application/vnd.ms-powerpoint.presentation.macroenabled.12; %unixfilename -view %s application/vnd.openxmlformats-officedocument.presentationml.template; %unixfilename -view %s application/vnd.ms-powerpoint.template.macroenabled.12; %unixfilename -view %s +application/x-hwp; %unixfilename -view %s END # and replace the original file diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl index ec71b9f90995..279302ab5f08 100755 --- a/sysui/desktop/share/brand.pl +++ b/sysui/desktop/share/brand.pl @@ -39,7 +39,6 @@ $destdir = pop @ARGV; mkdir $destdir,0777; $productname = "LibreOffice"; -$productname_br = "BrOffice"; $productfilename = "libreoffice"; $prefix = ""; $iconprefix = ""; @@ -51,10 +50,6 @@ while ($_ = $ARGV[0], /^-/) { $productname = $ARGV[0]; shift; } - if (/^-b/) { - $productname_br = $ARGV[0]; - shift; - } if (/^-u/) { $productfilename = $ARGV[0]; shift; @@ -121,9 +116,6 @@ while (<>) { } } - # replace %PRODUCTNAME_BR placeholders - s/%PRODUCTNAME_BR/$productname_br/g; - # replace %PRODUCTNAME placeholders s/%PRODUCTNAME/$productname/g; diff --git a/sysui/desktop/share/documents.ulf b/sysui/desktop/share/documents.ulf index 88fd05c879d2..77ce7dc1c3b4 100755 --- a/sysui/desktop/share/documents.ulf +++ b/sysui/desktop/share/documents.ulf @@ -67,6 +67,18 @@ en-US = "HTML Document Template" [extension] en-US = "%PRODUCTNAME Extension" +[ms-excel-sheet] +en-US = "Microsoft Excel Worksheet" + +[ms-powerpoint-presentation] +en-US = "Microsoft PowerPoint Presentation" + +[ms-word-document] +en-US = "Microsoft Word Document" + +[ms-word-document2] +en-US = "Microsoft Word Document" + [ms-excel-sheet-12] en-US = "Microsoft Excel Worksheet" diff --git a/sysui/desktop/share/launcher_comment.ulf b/sysui/desktop/share/launcher_comment.ulf index e36949263fce..c9cd594c567d 100755 --- a/sysui/desktop/share/launcher_comment.ulf +++ b/sysui/desktop/share/launcher_comment.ulf @@ -1,21 +1,190 @@ [writer] en-US = "Create and edit text and graphics in letters, reports, documents and Web pages by using Writer." +ast = "Escribi y edita testos y gráficos en cartes, informes, documentos y páxines web." +ca = "Creeu i editeu text i gràfics a cartes, informes, documents i pàgines web." +da = "Opret og redigér tekst og grafik i breve, rapporter, dokumenter og hjemmesider." +de = "Texte und Grafiken in Briefen, Berichten, Dokumenten und Webseiten erstellen und bearbeiten." +es = "Cree y edite textos y gráficos en cartas, informes, documentos y páginas web." +fi = "Luo ja muokkaa tekstejä ja grafiikkaa kirjeisiin, raportteihin, asiakirjoihin ja WWW-sivuille." +fr = "Créer et modifier des textes et graphiques pour lettres, rapports, documents ou pages Web." +gl = "Cree e modifique textos e gráficos en cartas, informes, documentos e páxinas web." +he = "יצירה ועריכה של טקסט וגרפיקה במכתבים, דוחות, מסמכים ואתרי אינטרנט." +hr = "Stvorite i uredite tekstualna i grafička pisma, izvještaje, dokumente i web stranice." +hu = "Levelek, jelentések, dokumentumok és weboldalak szövegének és grafikájának létrehozása és szerkesztése" +it = "Crea e modifica testo e grafica in lettere, rapporti, documenti e pagine Web." +is = "Búa til og sýsla með texta og myndefni í bréfum, skýrslum, ýmsum textaskjölum og vefsíðum." +ja = "手紙やレポート、文書、Webページ向けの文章や画像を作成・編集します。" +ku = "Nivîs û grafîkên di name, rapor, belge û rûpelên torê de çêbike û sererast bike." +nl = "Tekst en afbeeldingen bewerken in brieven, rapporten, documenten en webpagina's. " +pt_BR = "Crie e edite seus textos e gráficos em cartas, relatórios, documentos ou páginas da web." +ro = "Creați și editați documente text și grafice sub formă de scrisori, rapoarte, articole sau pagini web." +ru = "Создание и редактирование текстов и изображений в письмах, отчётах, документах и на веб-страницах." +sl = "Ustvarjajte in urejajte besedilo in grafiko v pismih, poročilih, dokumentih in spletnih straneh." +te = "పత్రాలు, నివేదికలు మరియు వెబ్ పేజీలలో పాఠ్యం మరియు గ్రాఫిక్స్ సృష్టి మరియు సవరణ" +vi = "Tạo và soạn văn bản và hình trong thư, báo cáo, tài liệu và trang web." +zh_CN = "创建编辑文档、报告、信件和网页中的文本和图形。" +zh_TW = "建立與編輯書信、報告、文件與網頁中的文字和圖形。" [impress] en-US = "Create and edit presentations for slideshows, meeting and Web pages by using Impress." +ast = "Fai y edita presentaciones pa pases de diapositives, reuniones y páxines web." +ca = "Creeu i editeu presentacions per a diapositives, conferències i pàgines web." +da = "Opret og rediger præsentationer til diasshows, møder og hjemmesider." +de = "Präsentationen für Vorführungen, Besprechungen und Web-Auftritte erstellen und bearbeiten." +el = "Δημιουργία και επεξεργασία παρουσιάσεων για προβολές διαφανειών, συσκέψεις και ιστοσελίδες" +es = "Cree y edite presentaciones para pases de diapositivas, reuniones y páginas web." +fi = "Luo ja muokkaa esityksiä esitelmiin, tapaamisiin ja WWW-sivuille." +fr = "Créer et modifier des présentations pour des diaporamas, des conférences et pour le Web." +gl = "Cree e modifique presentacións para diaporamas, conferencias e páxinas web." +he = "יצירה ועריכה של מצגות עבור שקופיות, פגישות ואתרי אינטרנט." +hr = "Stvorite i uredite prezentacije za sastanke i web stranice." +hu = "Bemutatók készítése és szerkesztése diavetítésekhez vagy a webre" +it = "Crea e modifica presentazioni per proiezioni, meeting e pagine Web." +is = "Búa til og breyta kynningum fyrir ráðstefnur, fyrirlestra og fyrir birtingu á vef." +ja = "スライドショーや会議、Webページ向けのプレゼンテーションを作成・編集します。" +nl = "Presentaties maken voor diavoorstellingen, vergaderingen en webpagina's." +pt_BR = "Crie e edite apresentações para reuniões ou páginas da web." +ro = "Creați și editați prezentări, diapozitive sau pagini web." +ru = "Создание и редактирование презентаций для слайд-шоу, докладов и веб-страниц." +sl = "Ustvarjajte in urejajte predstavitve za srečanja, predstavitve in spletne strani." +vi = "Tạo trình diễn để chiếu tự động, cho cuộc họp hoặc trang web" +zh_CN = "创建编辑用于幻灯片放映、会议和网页的演示文稿。" +zh_TW = "建立與編輯投影片放映、會議、網頁中的簡報。" [draw] en-US = "Create and edit drawings, flow charts, and logos by using Draw." +ast = "Crea y edita dibuxos, diagrames de fluxu y logos." +ca = "Creeu i editeu dibuixos, diagrames de flux i logotips." +da = "Opret og rediger tegninger, diagrammer og logoer." +de = "Zeichnungen, Flussdiagramme und Logos erstellen und bearbeiten" +el = "Δημιουργία και επεξεργασία σχεδιασμάτων, διαγραμμάτων ροής και λογοτύπων." +es = "Cree y edite dibujos, diagramas de flujo y logotipos." +fi = "Luo ja muokkaa piirroksia, vuokaavioita ja logoja." +fr = "Créer et modifier des dessins, diagrammes et logos." +gl = "Cree e modifique debuxos, diagramas de fluxo e logotipos." +he = ".יצירה ועריכה של ציורים, תרשימי זרימה וסמלילים" +hr = "Stvorite i uredite crteže, dijagrame toka i logotipove." +hu = "Rajzok, folyamatábrák és logók létrehozása és szerkesztése" +it = "Crea e modifica disegni, diagrammi di flusso e loghi." +is = "Búa til og breyta teikningum, skýringamyndum og flæðiritum." +ja = "ベクタ画像やフローチャート、ロゴを編集します。" +nl = "Tekeningen, diagrammen en logo's maken." +pt_BR = "Crie e edite desenho, fluxograma ou logos" +ro = "Creați și editați desene, grafice și logouri. " +ru = "Создание и редактирование рисунков, диаграмм и логотипов." +sl = "Ustvarjajte in urejajte slike, diagrame poteka in logotipe." +te = "చిత్రాలు,చిహ్నాలు(లోగో) మరియు ఫ్లో చార్టులు సృష్టి మరియు సవరణ" +vi = "Tạo và sửa hình vẽ, sơ đồ và biểu tượng" +zh_CN = "创建编辑图形、图表和标志。" +zn_TW = "建立與編輯繪圖、流程圖與標誌。" [calc] -en-US = "Perform calculation, analyze information and manage lists in spreadsheets by using Calc." +en-US = "Perform calculations, analyze information and manage lists in spreadsheets by using Calc." +ast = "Fai cálculos, analiza información y xestiona llistes en fueyes de cálculu." +ca = "Executeu càlculs, analitzeu informació i gestioneu llistats en fulls de càlcul." +da = "Udfør beregninger, analysér information og håndter lister i regneark." +de = "Berechnungen ausführen, Informationen analysieren und Listen in Tabellen verwalten." +el = "Εκτέλεση υπολογισμών, ανάλυση πληροφοριών και διαχείριση καταλόγων στα λογιστικά φύλλα" +es = "Realice cálculos, analice información y gestione listas en hojas de cálculo." +fi = "Tee laskelmia, käsittele tietoa ja hallitse luetteloita laskentataulukoissa." +fr = "Réaliser des calculs, analyser les informations et gérer des listes avec des feuilles de calcul." +gl = "Realice cálculos, analice información e administre listas en follas de cálculo." +he = "ביצוע חישובים, ניתוח מידע וניהול רשימות בגיליונות אלקטרונים." +hr = "Upravljajte izračunima i analizirajte informacije u proračunskim tablicama." +hu = "Számítások végrehajtása, adatok elemzése és listák kezelése munkafüzetekben" +it = "Esegue calcoli, analizza informazioni e gestisce elenchi in fogli di calcolo." +is = "Framkvæma útreikninga, greina gögn og meðhöndla lista í töfluformi." +ja = "シート上にある数値の集計や分析、シートの管理を行います。" +nl = "Berekeningen maken, informatie analyseren en lijsten beheren in rekenbladen." +pt_BR = "Realize cálculos, analise informação e gerencie listas em planilhas" +ro = "Efectuați calcule, analizați informații și administrați liste în foi de calcul." +ru = "Расчёты, анализ информации и управление списками с помощью электронных таблиц." +sl = "Izvajajte izračune, analizirajte informacije in upravljajte sezname in preglednice." +te = "స్ప్రెడ్ షీట్ లో లెక్కించు, వివరాలను విశ్లేషించు మరియు జాబితా నిర్వహించు " +vi = "Tính toán, xử lý thông tin và quản lý danh sách trong tờ bảng tính" +zh_CN = "在电子表格中计算、分析、管理信息。" +zh_TW = "在試算表中進行計算、分析資訊，以及管理清單。" [math] en-US = "Create and edit scientific formulas and equations by using Math." +ast = "Fai y edita fórmules científiques y ecuaciones." +ca = "Creeu i editeu fórmules científiques i equacions." +da = "Opret og redigér videnskabelige formler og ligninger." +de = "Wissenschaftliche Formeln und Gleichungen erstellen und bearbeiten." +el = "Δημιουργία και επεξεργασία επιστημονικών τύπων και εξισώσεων." +es = "Cree y edite fórmulas científicas y ecuaciones." +fi = "Luo ja muokkaa tieteellisiä kaavoja ja yhtälöitä." +fr = "Créer et modifier des formules scientifiques et des équations." +gl = "Cree e modifique fórmulas científicas e ecuacións." +he = "יצירה ועריכה של נוסחות מדעיות ומשוואות." +hr = "Stvorite i uredite znanstvene formule i jednadžbe." +hu = "Képletek és egyenletek létrehozása és szerkesztése" +it = "Crea e modifica formule scientifiche ed equazioni." +is = "Búa til og breyta vísindaformúlum og jöfnum." +ja = "数式や方程式を作成・編集します。" +nl = "Wetenschappelijke formules en vergelijkingen maken." +pt_BR = "Crie e edite fórmulas e equações científicas." +ro = "Creați și editați formule științifice și ecuații." +ru = "Создание и редактирование научных формул и уравнений." +sl = "Ustvarjajte in urejajte znanstvene formule in enačbe." +te = "శాస్త్ర సూత్రాలు మరియు సమీకరణాల సృష్టి మరియు సవరణ" +vi = "Tạo và soạn công thức và phương trình khoa học" +zh_CN = "创建编辑数学公式和方程" +zh_TW = "建立與編輯科學公式與方程式" + [base] en-US = "Manage databases, create queries and reports to track and manage your information by using Base." +ast = "Xestiona bases de datos, fai consultes ya informes, sigui y xestiona la to información." +ca = "Gestioneu bases de dades, creeu consultes i informes per fer un seguiment i gestionar la vostra informació." +da = "Håndtér databaser, og opret forespørgsler og rapporter til at overvåge og administrere dine informationer." +de = "Datenbanken verwalten, Abfragen und Berichte erstellen, um Ihre Daten zu überblicken und zu verwalten." +el = "Διαχείριση βάσεων δεδομένων, δημιουργία ερωτημάτων και αναφορών για την παρακολούθηση και διαχείριση των πληροφοριών σας." +es = "Gestione bases de datos, cree consultas e informes, siga y gestione su información." +fi = "Hallitse tietokantoja, tee hakuja ja raportteja seurataksesi ja hallitaksesi tietoja." +fr = "Gérer des bases de données, créer des requêtes et des rapports pour le suivi et l'analyse de vos données." +gl = "Administre bases de datos, cree consultas e informes, siga e xestione a súa información." +he = "ניהול מסדי נתונים, יצירת חקירות ודוחות על מנת לנהל את המידע שלכם ולעקוב אחריו." +hr = "Upravljajte bazama podataka, definirajte upite i izvještaje za praćenje i upravljanje vašim informacijama." +hu = "Adatbázisok kezelése, lekérdezések és jelentések készítése az információinak kezeléséhez" +it = "Gestisce database, crea query e rapporti per tracciare e gestire le proprie informazioni." +is = "Sýsla með gagnagrunna, búa til útfyllingarform og skýrslur, safna saman og vinna úr ýmiskonar gögnum." +ja = "データベースの管理やクエリの作成、情報の追跡や管理した結果を報告します。" +nl = "Databases beheren, query's en rapporten maken om uw informatie te beheren en op te zoeken." +nn = "Handsam databaser og lag spørringar og rapportar for å gjera informasjonen oversiktleg" +pt_BR = "Administre base de dados, crie consultas e relatórios para rastrear e gerenciar informação." +ro = "Administrați baze de date, creați interogări și rapoarte pentru a urmări și administra informațiile proprii." +ru = "Управление базами данных, создание запросов и отчётов для контролирования вашей информации." +sl = "Upravljajte podatkovne zbirke, ustvarjajte poizvedbe in poročila za sledenje in upravljanje svojih podatkov." +te = "మీ జాబితా మరియు వివరాలకోసం డాటాబేస్ నిర్వహణ మరియు ప్రశ్నలు, నివేదికల సృష్టి " +vi = "Quản lý cơ sở dữ liệu, tạo lệnh tìm kiếm và báo cáo để theo dõi và quản lý thông tin của bạn." +zh_CN = "管理数据库，创建查询和报告，跟踪和管理您的信息。" +zh_TW = "管理資料庫、建立查詢與報告，以追蹤及管理您的資訊。" + [startcenter] en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation." +ast = "Suite de productividá d'oficina compatible con ODF, el formatu de documentos abiertu y estandarizáu. Col sofitu de la Document Foundation." +ca = "Paquet ofimàtic compatible amb el format estàndard de documents ODF. Mantingut per la Document Foundation." +da = "Office produktionspakken er kompatibel med det åbne og standardiseret ODF-dokumentformat. Understøttet af The Document Foundation." +de = "Die zum offenen und standardisierten ODF-Format kompatible Sammlung von Büroanwendungen. Unterstützt durch »The Document Foundation«." +es = "Suite de productividad para la oficina compatible con ODF, el formato de documentos abierto y estandarizado. Con el soporte de la Document Foundation." +fi = "Avointa ja standardoitua ODF-asiakirjamuotoa tukeva toimisto-ohjelmisto. The Document Foundation -säätiön tukema." +fr = "Suite bureautique compatible avec le format de document standard et ouvert ODF. Soutenue par The Document Foundation." +gl = "A suite de produtividade de oficina compatíbel co formato aberto e estandarizado de documentos ODF. Co apoio da Document Foundation" +he = "חבילת הפרודקטיביות המשרדית תואמת את פורמט המסמכים הפתוח והתקני ODF. נתמכת על ידי The Document Foundation." +hr = "Paket uredskih aplikacija s podrškom za otvoren i standardiziran ODF format dokumenata. Podržan od strane Document fundacije." +hu = "A nyílt és szabványos ODF formátummal kompatibilis irodai programcsomag a Document Foundation támogatásával" +it = "La suite di produttività compatibile con il formato standard e aperto dei documenti ODF. Supportata dalla The Document Foundation." +is = "Forritavöndull til hjálpar við vinnu við gagna- og textavinnslu, styðst við ODF sjalasniðið sem er staðlað og frjálst snið fyrir ýmiskonar skjöl. Stutt af Document Foundation." +ja = "オープンで標準化されたODFドキュメントフォーマットに対応した生産性の高いオフィススイートです。The Document Foundationによってサポートされています。" +nl = "Het kantoorpakket compatibel met ODF (het gestandaardiseerde Open Document Formaat). Ondersteund door The Document Foundation. " +pt_BR = "Suíte de escritório produtiva, compatível com o formato aberto ODF. Suportado pela The Document Foundation." +ro = "Suita de birou compatibilă cu formatul de document liber și standardizat ODF, cu asistență oferită de The Document Foundation." +ru = "Офисный пакет, совместимый с открытым и стандартизованным форматом документов ODF. Поддерживается The Document Foundation." +sl = "Pisarniška zbirka, združljiva z odprtim in standardiziranim zapisom ODF. Podpira jo The Document Foundation." +te = "రహస్యాలు లేని మరియు ప్రామాణికమైన ODF కు అనుకూలమైన కార్యాలయ ఉత్పాదకత అనువర్తనాల సముదాయం, డాక్యుమెంట్ ఫౌండేషన్ తోడ్పాటుతో" +vi = "Bộ văn phòng thích hợp với chuẩn đinh dạng tài liệu mở ODF, nhận được sự hỗ trợ từ Quỹ The Document Foundation" +zh_CN = "兼容开放标准 ODF 的办公软件套装。由 The Document Foundation 支持。" +zh_TW = "與開放且標準化的 ODF 文件格式相容的辦公生產力套裝軟體。由文件基金會提供支援。" diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf index ff8041a155fc..902826c7befd 100755 --- a/sysui/desktop/share/launcher_genericname.ulf +++ b/sysui/desktop/share/launcher_genericname.ulf @@ -1,23 +1,190 @@ [writer] en-US = "Word Processor" +ast = "Procesador de testos" +ca = "Processador de texts" +da = "Tekstbehandling" +de = "Textverarbeitung" +es = "Procesador de textos" +fi = "Tekstinkäsittely" +fr = "Traitement de texte" +gl = "Procesador de texto" +he = "מעבד תמלילים" +hr = "Obrađivač teksta" +hu = "Szövegszerkesztő" +it = "Word processor" +is = "Ritvinnsla" +ja = "ワープロ" +ku = "Bernameya nivîsê" +nl = "Tekstverwerker" +pt_BR = "Processador de texto" +ro = "Procesor de documente" +ru = "Редактор документов" +sl = "Urejevalnik besedila" +te = "పాఠ్య సవరణ" +vi = "Soạn thảo văn bản" +zh_CN = "文档编辑器" +zh_TW = "文書處理器" [impress] en-US = "Presentation" +ast = "Presentación" +ca = "Presentació" +da = "Præsentation" +de = "Präsentationen" +el = "Παρουσίαση" +es = "Presentación" +fi = "Esitys" +fr = "Présentation" +gl = "Presentación" +he = "מצגות" +hr = "Prezentacija" +hu = "Bemutatókészítő" +it = "Presentazione" +is = "Skyggnusýning" +ja = "プレゼンテーション" +nl = "Presentatie" +pt_BR = "Apresentação" +ro = "Prezentări" +ru = "Презентация" +sl = "Predstavitev" +vi = "Trình diễn" +zh_CN = "演示文稿" +zh_TW = "簡報" [calc] en-US = "Spreadsheet" +ast = "Fueya de cálculu" +ca = "Full de càlcul" +da = "Regneark" +de = "Tabellenkalkulation" +el = "Λογιστικό φύλλο" +es = "Hoja de cálculo" +fi = "Taulukko" +fr = "Feuille de calcul" +gl = "Folla de cálculo" +he = "גיליון אלקטרוני" +hr = "Proračunske tablice" +hu = "Táblázatkezelő" +it = "Foglio di calcolo" +is = "Töflureikniblað" +ja = "表計算" +nl = "Rekenblad" +pt_BR = "Planilha" +ro = "Foi de calcul" +ru = "Электронные таблицы" +sl = "Preglednica" +te = "స్ప్రెడ్ షీట్" +vi = "Tờ bảng tính" +zh_CN = "电子表格" +zh_TW = "試算表" [base] en-US = "Database Development" +ast = "Desendolcu de bases de datos" +ca = "Desenvolupament de bases de dades" +da = "Databaseudvikling" +de = "Datenbankentwicklung" +el = "Ανάπτυξη βάσεων δεδομένων" +es = "Desarrollo de bases de datos" +fi = "Tietokanta" +fr = "Développement de bases de données" +gl = "Desenvolvemento de bases de datos" +he = "פיתוח מסדי נתונים" +hr = "Razvoj baza podataka" +hu = "Adatbázis-fejlesztés" +it = "Sviluppo database" +is = "Hönnun gagnagrunna" +ja = "データベース開発" +nl = "Database-ontwikkeling" +nn = "Databasehandsaming" +pt_BR = "Desenvolvimento de base de dados" +ro = "Dezvoltare baze de date" +ru = "Разработка баз данных" +sl = "Razvoj podatkovnih zbirk" +te = "డాటాబేస్ అభివృద్ధి" +vi = "Phát triển Cơ sở dữ liệu" +zn_CN = "数据库开发" +zh_TW = "資料庫開發" [math] en-US = "Formula Editor" +ast = "Editor de fórmules" +ca = "Editor de fórmules" +da = "Formelredigering" +de = "Formel-Editor" +el = "Τύπος" +es = "Editor de fórmulas" +fi = "Kaavaeditori" +fr = "Éditeur de formules" +gl = "Editor de fórmulas" +he = "עורך נוסחות" +hr = "Uređivač jednadžbi" +hu = "Képletszerkesztő" +it = "Editor di formule" +is = "Formúluritill" +ja = "数式エディタ" +nl = "Formule-editor" +pt_BR = "Editor de fórmula" +ro = "Editor de formule" +ru = "Редактор формул" +sl = "Urejevalnik formule" +te = "సూత్ర సవరణి" +vi = "Trình soạn công thức" +zh_CN = "公式编辑器" +zh_TW = "公式編輯器" [draw] en-US = "Drawing Program" +ast = "Programa de dibuxu" +ca = "Programa de dibuix" +da = "Tegneprogram" +de = "Zeichenprogramm" +el = "Πρόγραμμα Σχεδίασης" +es = "Programa de dibujo" +fi = "Piirros" +fr = "Logiciel de dessin" +gl = "Programa de debuxo" +he = "תוכנת ציור" +hr = "Crtanje" +hu = "Rajzoló" +it = "Programma di disegno" +is = "Teikniforrit" +ja = "図形描画" +nl = "Tekenprogramma" +pt_BR = "Programa para desenho" +ro = "Program de desensare " +ru = "Программа для рисования" +sl = "Program za risanje" +te = "చిత్రలేఖన ప్రోగ్రామ్" +vi = "Chương trình Vẽ" +zh_CN = "绘图工具" +zh_TW = "繪圖程式" [startcenter] en-US = "Office" +ast = "Oficina" +ca = "Oficina" +da = "Kontor" +de = "Büroanwendungen" +es = "Oficina" +fi = "Toimisto" +fr = "Bureautique" +gl = "Oficina" +he = "אופיס" +hr = "Ured" +hu = "Iroda" +it = "Office" +is = "Skrifstofa" +ja = "オフィス" +nl = "Kantoor" +pt_BR = "Escritório" +ro = "Suită de birou" +ru = "Офис" +sl = "Pisarna" +te = "కార్యాలయం" +vi = "Bộ văn phòng" +zh_CN = "办公" +zh_TW = "辦公" [javafilter] en-US = "Small Device Format Importer" diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk index 68cba5949e5b..cfaa1ee1fdea 100755 --- a/sysui/desktop/share/makefile.mk +++ b/sysui/desktop/share/makefile.mk @@ -150,10 +150,10 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN) @@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f) @echo Creating desktop entries for $(@:f) .. @echo --------------------------------- - @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix "$(ICONPREFIX.libreoffice)-" $< $(@:db).$(INPATH).$(@:f) - @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf - @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf - @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -p '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf + @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$(ICONPREFIX.libreoffice)-' $< $(@:db).$(INPATH).$(@:f) + @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf + @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf + @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf .IF "$(WITH_LIBSN)"=="YES" @noop x$(foreach,i,$(LAUNCHERLIST) $(shell @echo "StartupNotify=true" >> $(@:db).$(INPATH).$(@:f)/$i.desktop))x .ENDIF diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl index cdc636b7a266..197c333e6f37 100755 --- a/sysui/desktop/share/translate.pl +++ b/sysui/desktop/share/translate.pl @@ -37,7 +37,6 @@ eval 'exec perl -wS $0 ${1+"$@"}' my ($prefix, $ext, $key); $productname = "LibreOffice"; -$productname_br = "BrOffice"; $workdir = "."; while ($_ = $ARGV[0], /^-/) { @@ -47,10 +46,6 @@ while ($_ = $ARGV[0], /^-/) { $productname = $ARGV[0]; shift; } - if (/^-b/) { - $productname_br = $ARGV[0]; - shift; - } if (/^-d/) { $workdir = $ARGV[0]; shift; @@ -127,7 +122,6 @@ KEY: while (<TEMPLATE>) { $value = substr($value, index($value, "\"") + 1, rindex($value, "\"") - 1); # replace resource placeholder - $value=~s/%PRODUCTNAME_BR/$productname_br/g; $value=~s/%PRODUCTNAME/$productname/g; $locale=~s/-/_/; diff --git a/sysui/desktop/solaris/mailcap b/sysui/desktop/solaris/mailcap index 19407fd81805..c9d8cf35f903 100755 --- a/sysui/desktop/solaris/mailcap +++ b/sysui/desktop/solaris/mailcap @@ -72,8 +72,10 @@ application/vnd.writerperfect; %PREFIX -view %s application/wordperfect5.1; %PREFIX -view %s application/x-wordperfect; %PREFIX -view %s application/wordperfect; %PREFIX -view %s +application/vnd.lotus-wordpro; %PREFIX -view %s application/wpwin; %PREFIX -view %s application/vnd.openofficeorg.extension; %PREFIX %s +application/x-hwp; %PREFIX -view %s END else # backing all entries pointing to our binary diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec index 37806153aa31..933a3ae2c71c 100755 --- a/sysui/desktop/suse/suse-menus.spec +++ b/sysui/desktop/suse/suse-menus.spec @@ -279,6 +279,7 @@ application/vnd.wordperfect; %unixfilename -view %s application/wordperfect5.1; %unixfilename -view %s application/x-wordperfect; %unixfilename -view %s application/wordperfect; %unixfilename -view %s +application/vnd.lotus-wordpro; %unixfilename -view %s application/wpwin; %unixfilename -view %s application/vnd.openofficeorg.extension; %unixfilename %s application/vnd.openxmlformats-officedocument.wordprocessingml.document; %unixfilename -view %s @@ -293,6 +294,7 @@ application/vnd.openxmlformats-officedocument.presentationml.presentation; %unix application/vnd.ms-powerpoint.presentation.macroenabled.12; %unixfilename -view %s application/vnd.openxmlformats-officedocument.presentationml.template; %unixfilename -view %s application/vnd.ms-powerpoint.template.macroenabled.12; %unixfilename -view %s +application/x-hwp; %unixfilename -view %s END # and replace the original file diff --git a/sysui/prj/build.lst b/sysui/prj/build.lst index f44ee336dcab..2eab5a189b5c 100644 --- a/sysui/prj/build.lst +++ b/sysui/prj/build.lst @@ -1,4 +1,4 @@ -su sysui : TRANSLATIONS:translations offapi xml2cmp rdbmaker l10ntools setup_native NULL +su sysui : TRANSLATIONS:translations offapi NATIVE:xml2cmp DESKTOP:rdbmaker DESKTOP:l10ntools DESKTOP:setup_native NULL #su sysui\source\win32\QuickStart nmake - w su_win32_quickstart NULL #su sysui\source\win32\QuickStart\so nmake - w su_win32_quickstart_so su_win32_quickstart.w NULL su sysui\desktop\icons nmake - w su_iconsw NULL diff --git a/sysui/prj/d.lst b/sysui/prj/d.lst index 918ee8bcbc8f..b62b651eb093 100644 --- a/sysui/prj/d.lst +++ b/sysui/prj/d.lst @@ -1,23 +1,23 @@ -mkdir: %_DEST%\res%_EXT%\icons -mkdir: %_DEST%\inc%_EXT%\icons -mkdir: %_DEST%\bin%_EXT%\so -mkdir: %_DEST%\bin%_EXT%\desktop-integration -mkdir: %_DEST%\bin%_EXT%\desktop-integration\rpm -mkdir: %_DEST%\bin%_EXT%\desktop-integration\deb -mkdir: %_DEST%\bin%_EXT%\desktop-integration\pkg +mkdir: %_DEST%\res\icons +mkdir: %_DEST%\inc\icons +mkdir: %_DEST%\bin\so +mkdir: %_DEST%\bin\desktop-integration +mkdir: %_DEST%\bin\desktop-integration\rpm +mkdir: %_DEST%\bin\desktop-integration\deb +mkdir: %_DEST%\bin\desktop-integration\pkg -..\%__SRC%\misc\*.ico %_DEST%\res%_EXT%\icons\*.ico -..\%__SRC%\misc\*.gif %_DEST%\res%_EXT%\icons\*.gif -..\%__SRC%\bin\*.zip %_DEST%\bin%_EXT%\*.zip -..\%__SRC%\bin\*.tar.gz %_DEST%\bin%_EXT%\*.tar.gz -..\%__SRC%\bin\rpm\*.tar.gz %_DEST%\bin%_EXT%\desktop-integration\rpm\*.tar.gz -..\%__SRC%\bin\deb\*.tar.gz %_DEST%\bin%_EXT%\desktop-integration\deb\*.tar.gz -..\%__SRC%\bin\pkg\*.tar.gz %_DEST%\bin%_EXT%\desktop-integration\pkg\*.tar.gz +..\%__SRC%\misc\*.ico %_DEST%\res\icons\*.ico +..\%__SRC%\misc\*.gif %_DEST%\res\icons\*.gif +..\%__SRC%\bin\*.zip %_DEST%\bin\*.zip +..\%__SRC%\bin\*.tar.gz %_DEST%\bin\*.tar.gz +..\%__SRC%\bin\rpm\*.tar.gz %_DEST%\bin\desktop-integration\rpm\*.tar.gz +..\%__SRC%\bin\deb\*.tar.gz %_DEST%\bin\desktop-integration\deb\*.tar.gz +..\%__SRC%\bin\pkg\*.tar.gz %_DEST%\bin\desktop-integration\pkg\*.tar.gz -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll +..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll -..\%__SRC%\misc\ooo3_main_app.ico %_DEST%\bin%_EXT%\soffice.ico +..\%__SRC%\misc\ooo3_main_app.ico %_DEST%\bin\soffice.ico -..\%__SRC%\misc\desktopshare\*.desktop %_DEST%\pck%_EXT%\*.desktop -..\%__SRC%\misc\PkgInfo %_DEST%\pck%_EXT%\PkgInfo -..\%__SRC%\misc\Info.plist %_DEST%\pck%_EXT%\Info.plist +..\%__SRC%\misc\desktopshare\*.desktop %_DEST%\pck\*.desktop +..\%__SRC%\misc\PkgInfo %_DEST%\pck\PkgInfo +..\%__SRC%\misc\Info.plist %_DEST%\pck\Info.plist diff --git a/sysui/source/win32/misc/WinImplHelper.cxx b/sysui/source/win32/misc/WinImplHelper.cxx index 845a324400e3..8f62008ba76e 100644 --- a/sysui/source/win32/misc/WinImplHelper.cxx +++ b/sysui/source/win32/misc/WinImplHelper.cxx @@ -35,7 +35,7 @@ #include "WinImplHelper.hxx" #include <com/sun/star/uno/Sequence.hxx> -#include <systools/win32/user9x.h> +#include <windows.h> //------------------------------------------------------------ // namespace directives diff --git a/sysui/util/exports.dxp b/sysui/util/exports.dxp index f0e1c69934bc..70033078921a 100755 --- a/sysui/util/exports.dxp +++ b/sysui/util/exports.dxp @@ -1,2 +1 @@ -component_getImplementationEnvironment component_getFactory |