tdf#140215 Simplify the handling of .ulf files

Now the headings in the ulf files for .desktop files are
in the form [filename_Key]

Gallery names are also adjusted to fit the new scheme, where there is
no longer a need to pass a --key argument to desktop-translate.py

Sync comments with .desktop files and the remaining .ulf and remove
obsolete Mandriva Linux meta data while at it.

Script to mass-replace relevant names in translations will be
provided to infra.

Change-Id: I87e8028aa5b66f5f5560efa62ddd9b1e5b61c49c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138455
Tested-by: Jenkins
Reviewed-by: Sophie Gautier <sophi@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

12 files changed, 95 insertions, 100 deletions

diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index 1f578f5ffcf5..b86521a3a80f 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -110,9 +110,7 @@ share_ICONS := $(foreach size,16x16 32x32 48x48,\
 
 MIMEDESKTOPS := $(foreach mime,$(MIMELIST),$(share_SRCDIR)/mimetypes/$(mime).desktop)
 ULFS := documents.ulf \
-	launcher_comment.ulf \
-	launcher_genericname.ulf \
-	launcher_unityquicklist.ulf
+	launcher.ulf
 
 $(eval $(call gb_CustomTarget_CustomTarget,sysui/share))
 
@@ -211,11 +209,7 @@ $(share_WORKDIR)/%/build.flag: $(share_SRCDIR)/share/brand.pl $(LAUNCHERS) \
 		$(brand_URIPARAM) \
 		--iconprefix '$${UNIXBASISROOTNAME}-' $(LAUNCHERS) $(share_WORKDIR)/$*
 	$(call gb_ExternalExecutable_get_command,python) $(share_TRANSLATE) -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \
-		--ext "desktop" --key "Comment" $(share_WORKDIR)/launcher_comment.ulf
-	$(call gb_ExternalExecutable_get_command,python) $(share_TRANSLATE) -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \
-		--ext "desktop" --key "GenericName" $(share_WORKDIR)/launcher_genericname.ulf
-	$(call gb_ExternalExecutable_get_command,python) $(share_TRANSLATE) -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \
-		--ext "desktop" --key "UnityQuickList" $(share_WORKDIR)/launcher_unityquicklist.ulf
+		--ext "desktop" $(share_WORKDIR)/launcher.ulf
 	touch $@
 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
 
diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index b2a06b5c4730..c2087120d532 100644
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -20,12 +20,12 @@ Version=1.0
 Terminal=false
 Icon=base
 Type=Application
-Categories=Office;Database;X-Red-Hat-Base;X-MandrivaLinux-MoreApplications-Databases;
+Categories=Office;Database;X-Red-Hat-Base;
 Exec=${UNIXBASISROOTNAME} --base %%FILE%%
 MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
 Name=%PRODUCTNAME Base
 GenericName=Database Development
-Comment=Manage databases, create queries and reports to track and manage your information
+Comment=Manage databases, create queries and reports to track and manage your information.
 StartupNotify=true
 X-GIO-NoFuse=true
 Keywords=Data;SQL;
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index 8cc082c2730f..a6a06fa04ff6 100644
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -20,12 +20,12 @@ Version=1.0
 Terminal=false
 Icon=calc
 Type=Application
-Categories=Office;Spreadsheet;X-Red-Hat-Base;X-MandrivaLinux-Office-Spreadsheets;
+Categories=Office;Spreadsheet;X-Red-Hat-Base;
 Exec=${UNIXBASISROOTNAME} --calc %%FILE%%
 MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;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;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.ms-works;application/clarisworks;application/x-iwork-numbers-sffnumbers;application/vnd.apple.numbers;application/x-starcalc;
 Name=%PRODUCTNAME Calc
 GenericName=Spreadsheet
-Comment=Perform calculations, analyze information and manage lists in spreadsheets
+Comment=Perform calculations, analyze information and manage lists in spreadsheets.
 StartupNotify=true
 X-GIO-NoFuse=true
 Keywords=Accounting;Stats;OpenDocument Spreadsheet;Chart;Microsoft Excel;Microsoft Works;OpenOffice Calc;ods;xls;xlsx;
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index e5fe6864fda4..f2827b95b7d1 100644
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -20,12 +20,12 @@ Version=1.0
 Terminal=false
 Icon=draw
 Type=Application
-Categories=Office;FlowChart;Graphics;2DGraphics;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing;
+Categories=Office;FlowChart;Graphics;2DGraphics;VectorGraphics;X-Red-Hat-Base;
 Exec=${UNIXBASISROOTNAME} --draw %%FILE%%
 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.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;image/x-freehand;application/clarisworks;application/x-pagemaker;application/pdf;application/x-stardraw;image/x-emf;image/x-wmf;
 Name=%PRODUCTNAME Draw
 GenericName=Drawing Program
-Comment=Create and edit drawings, flow charts and logos
+Comment=Create and edit drawings, flow charts and logos.
 StartupNotify=true
 X-GIO-NoFuse=true
 Keywords=Vector;Schema;Diagram;Layout;OpenDocument Graphics;Microsoft Publisher;Microsoft Visio;Corel Draw;cdr;odg;svg;pdf;vsd;
diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
index 5a0867b44a8a..ad228990aa62 100644
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -20,12 +20,12 @@ Version=1.0
 Terminal=false
 Icon=impress
 Type=Application
-Categories=Office;Presentation;X-Red-Hat-Base;X-MandrivaLinux-Office-Presentations;
+Categories=Office;Presentation;X-Red-Hat-Base;
 Exec=${UNIXBASISROOTNAME} --impress %%FILE%%
 MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;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;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.oasis.opendocument.presentation-flat-xml;application/x-iwork-keynote-sffkey;application/vnd.apple.keynote;
 Name=%PRODUCTNAME Impress
 GenericName=Presentation
-Comment=Create and edit presentations for slideshows, meetings and Web pages
+Comment=Create and edit presentations for slideshows, meetings and Web pages.
 StartupNotify=true
 X-GIO-NoFuse=true
 Keywords=Slideshow;Slides;OpenDocument Presentation;Microsoft PowerPoint;Microsoft Works;OpenOffice Impress;odp;ppt;pptx;
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index 3fb261035381..4f3fbce6b04e 100644
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -21,12 +21,12 @@ Terminal=false
 NoDisplay=false
 Icon=math
 Type=Application
-Categories=Office;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other;
+Categories=Office;Education;Science;Math;X-Red-Hat-Base;
 Exec=${UNIXBASISROOTNAME} --math %%FILE%%
 MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;application/mathml+xml;
 Name=%PRODUCTNAME Math
 GenericName=Formula Editor
-Comment=Create and edit scientific formulas and equations
+Comment=Create and edit scientific formulas and equations.
 StartupNotify=true
 X-GIO-NoFuse=true
 Keywords=Equation;OpenDocument Formula;Formula;odf;MathML;
diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop
index d2423094d6aa..4732568e3fde 100644
--- a/sysui/desktop/menus/startcenter.desktop
+++ b/sysui/desktop/menus/startcenter.desktop
@@ -21,7 +21,7 @@ Terminal=false
 NoDisplay=false
 Icon=startcenter
 Type=Application
-Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
+Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;
 Exec=${UNIXBASISROOTNAME} %%FILE%%
 MimeType=application/vnd.openofficeorg.extension;x-scheme-handler/vnd.libreoffice.cmis;x-scheme-handler/vnd.sun.star.webdav;x-scheme-handler/vnd.sun.star.webdavs;x-scheme-handler/vnd.libreoffice.command;x-scheme-handler/ms-word;x-scheme-handler/ms-powerpoint;x-scheme-handler/ms-excel;x-scheme-handler/ms-visio;x-scheme-handler/ms-access;
 Name=%PRODUCTNAME
diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
index 4fad53f014bd..ec9f316a726a 100644
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -20,12 +20,12 @@ Version=1.0
 Terminal=false
 Icon=writer
 Type=Application
-Categories=Office;WordProcessor;X-Red-Hat-Base;X-MandrivaLinux-Office-Wordprocessors;
+Categories=Office;WordProcessor;X-Red-Hat-Base;
 Exec=${UNIXBASISROOTNAME} --writer %%FILE%%
 MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;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;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;application/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks;application/x-sony-bbeb;application/x-abiword;application/x-iwork-pages-sffpages;application/vnd.apple.pages;application/x-mswrite;application/x-starwriter;
 Name=%PRODUCTNAME Writer
 GenericName=Word Processor
-Comment=Create and edit text and graphics in letters, reports, documents and Web pages
+Comment=Create and edit text and graphics in letters, reports, documents and Web pages.
 StartupNotify=true
 X-GIO-NoFuse=true
 Keywords=Text;Letter;Fax;Document;OpenDocument Text;Microsoft Word;Microsoft Works;Lotus WordPro;OpenOffice Writer;CV;odt;doc;docx;rtf;
diff --git a/sysui/desktop/share/launcher.ulf b/sysui/desktop/share/launcher.ulf
new file mode 100644
index 000000000000..78c260cce6d3
--- /dev/null
+++ b/sysui/desktop/share/launcher.ulf
@@ -0,0 +1,80 @@
+/*
+ * 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 .
+ */
+
+[writer_Comment]
+en-US = "Create and edit text and graphics in letters, reports, documents and Web pages."
+
+[impress_Comment]
+en-US = "Create and edit presentations for slideshows, meetings and Web pages."
+
+[draw_Comment]
+en-US = "Create and edit drawings, flow charts and logos."
+
+[calc_Comment]
+en-US = "Perform calculations, analyze information and manage lists in spreadsheets."
+
+[math_Comment]
+en-US = "Create and edit scientific formulas and equations."
+
+[base_Comment]
+en-US = "Manage databases, create queries and reports to track and manage your information."
+
+[startcenter_Comment]
+en-US = "Launch applications to create text documents, spreadsheets, presentations, drawings, formulas, and databases, or open recently used documents."
+
+[writer_GenericName]
+en-US = "Word Processor"
+
+[impress_GenericName]
+en-US = "Presentation"
+
+[calc_GenericName]
+en-US = "Spreadsheet"
+
+[base_GenericName]
+en-US = "Database Development"
+
+[math_GenericName]
+en-US = "Formula Editor"
+
+[draw_GenericName]
+en-US = "Drawing Program"
+
+[startcenter_GenericName]
+en-US = "Office"
+
+[xsltfilter_GenericName]
+en-US = "XSLT based filters"
+
+[writer_UnityQuickList]
+en-US = "New Document"
+
+[impress_UnityQuickList]
+en-US = "New Presentation"
+
+[calc_UnityQuickList]
+en-US = "New Spreadsheet"
+
+[base_UnityQuickList]
+en-US = "New Database"
+
+[math_UnityQuickList]
+en-US = "New Formula"
+
+[draw_UnityQuickList]
+en-US = "New Drawing"
diff --git a/sysui/desktop/share/launcher_comment.ulf b/sysui/desktop/share/launcher_comment.ulf
deleted file mode 100644
index d7f9e8beb9c1..000000000000
--- a/sysui/desktop/share/launcher_comment.ulf
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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 .
- */
-
-[writer]
-en-US = "Create and edit text and images in letters, reports, documents and Web pages by using Writer."
-
-[impress]
-en-US = "Create and edit presentations for slideshows, meeting and Web pages by using Impress."
-
-[draw]
-en-US = "Create and edit drawings, flow charts, and logos by using Draw."
-
-[calc]
-en-US = "Perform calculations, analyze information and manage lists in spreadsheets by using Calc."
-
-[math]
-en-US = "Create and edit scientific formulas and equations by using Math."
-
-[base]
-en-US = "Manage databases, create queries and reports to track and manage your information by using Base."
-
-[startcenter]
-en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation."
-
diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf
deleted file mode 100644
index 108d0e87786f..000000000000
--- a/sysui/desktop/share/launcher_genericname.ulf
+++ /dev/null
@@ -1,23 +0,0 @@
-[writer]
-en-US = "Word Processor"
-
-[impress]
-en-US = "Presentation"
-
-[calc]
-en-US = "Spreadsheet"
-
-[base]
-en-US = "Database Development"
-
-[math]
-en-US = "Formula Editor"
-
-[draw]
-en-US = "Drawing Program"
-
-[startcenter]
-en-US = "Office"
-
-[xsltfilter]
-en-US = "XSLT based filters"
diff --git a/sysui/desktop/share/launcher_unityquicklist.ulf b/sysui/desktop/share/launcher_unityquicklist.ulf
deleted file mode 100644
index c41a6451c765..000000000000
--- a/sysui/desktop/share/launcher_unityquicklist.ulf
+++ /dev/null
@@ -1,17 +0,0 @@
-[writer]
-en-US = "New Document"
-
-[impress]
-en-US = "New Presentation"
-
-[calc]
-en-US = "New Spreadsheet"
-
-[base]
-en-US = "New Database"
-
-[math]
-en-US = "New Formula"
-
-[draw]
-en-US = "New Drawing"