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>

extras/CustomTarget_gallsystem.mk

@@ -30,7 +30,7 @@ $(call gb_CustomTarget_get_workdir,extras/gallsysstr)/%.str : \
                     $(SRCDIR)/solenv/bin/desktop-translate.py
 	mkdir -p $(@D)/$* && cp $(SRCDIR)/extras/source/gallery/gallery_system/dummy.str $(@D)/$*/$*.str && \
 	$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/solenv/bin/desktop-translate.py \
-            --ext "str" --key "name" -d $(@D)/$*/ $(@D)/extras_gallsystem.ulf && \
+            --ext "str" -d $(@D)/$*/ $(@D)/extras_gallsystem.ulf && \
 	mv $(@D)/$*/$*.str $@
 
 # vim: set noet sw=4 ts=4:

extras/source/gallery/share/gallery_names.ulf

@@ -7,34 +7,34 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-[arrows]
+[arrows_name]
 en-US = "Arrows"
 
-[backgrounds]
+[backgrounds_name]
 en-US = "Backgrounds"
 
-[bullets]
+[bullets_name]
 en-US= "Bullets"
 
-[bpmn]
+[bpmn_name]
 en-US = "BPMN"
 
-[diagrams]
+[diagrams_name]
 en-US = "Diagrams"
 
-[flowchart]
+[flowchart_name]
 en-US = "Flow chart"
 
-[icons]
+[icons_name]
 en-US = "Icons"
 
-[network]
+[network_name]
 en-US = "Network"
 
-[shapes]
+[shapes_name]
 en-US = "Shapes"
 
-[sounds]
+[sounds_name]
 en-US = "Sounds"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

solenv/bin/desktop-translate.py

@@ -54,7 +54,6 @@ def encode_desktop_string(s_value):
 parser = argparse.ArgumentParser()
 parser.add_argument("-p", dest="productname", default="LibreOffice")
 parser.add_argument("-d", dest="workdir", default=".")
-parser.add_argument("--key", dest="key")
 parser.add_argument("--prefix", dest="prefix", default="")
 parser.add_argument("--ext", dest="ext")
 parser.add_argument("--template-dir", dest="template_dir", default=None)
@@ -67,13 +66,6 @@ if o.template_dir is None:
 else:
     template_dir = o.template_dir
 
-# hack for unity section
-if o.key == "UnityQuickList":
-    OUTKEY = "Name"
-else:
-    OUTKEY = o.key
-
-
 templates = {}
 
 # open input file
@@ -85,14 +77,18 @@ template = None
 for line in source:
     if line.strip() == "":
         continue
+    # the headings in the ulf files for .desktop files are in the form [filename_Key]
     if line[0] == "[":
-        template = line.split("]", 1)[0][1:]
+        heading = line.split("]", 1)[0][1:]
+        template = heading.split("_", 1)[0]
+        key = heading.split("_", 1)[1]
         entry = {}
         # For every section in the specified ulf file there should exist
         # a template file in $workdir ..
         entry["outfile"] = f"{template_dir}{template}.{o.ext}"
         entry["translations"] = {}
-        templates[template] = entry
+        entry["key"] = key
+        templates[heading] = entry
     else:
         # split locale = "value" into 2 strings
         if " = " not in line:
@@ -116,7 +112,7 @@ for line in source:
 
             locale = locale.replace("-", "_")
 
-            templates[template]["translations"][locale] = value
+            templates[heading]["translations"][locale] = value
 
 source.close()
 
@@ -145,15 +141,18 @@ for template, entries in templates.items():
     # emit the template to the output file
     for line in template_file:
         keyline = line
-        if keyline.startswith(o.key):
+        if keyline.startswith(entries["key"]):
-            keyline = OUTKEY + keyline[len(o.key) :]
+            # hack for Unity section
+            if entries["key"] == "UnityQuickList":
+                OUTKEY = "Name"
+            else:
+                OUTKEY = entries["key"]
+            keyline = OUTKEY + keyline[len(entries["key"]) :]
         outfile.write(keyline)
-        if o.key in line:
+        if entries["key"] in line:
             translations = entries["translations"]
             for locale in sorted(translations.keys()):
                 value = translations.get(locale, None)
-                # print "locale is $locale\n";
-                # print "value is $value\n";
                 if value:
                     if o.ext in ("desktop", "str"):
                         if o.ext == "desktop":

solenv/gbuild/Gallery.mk

@@ -37,7 +37,7 @@ define gb_Gallery__command_str
 cp -f $(GALLERY_STRFILE) $@ && \
 $(call gb_ExternalExecutable_get_command,python) \
 		$(gb_Gallery_TRANSLATE) \
-		--ext "str" --key "name" \
+		--ext "str" \
 		-d $(GALLERY_WORKDIR) \
 		$(GALLERY_ULFFILE)
 endef

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.ulf
-	launcher_genericname.ulf \
-	launcher_unityquicklist.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
+		--ext "desktop" $(share_WORKDIR)/launcher.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
 	touch $@
 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
 

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;

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;

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;

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;

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;

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

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;

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"

sysui/desktop/share/launcher_comment.ulf

@@ -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."
-

sysui/desktop/share/launcher_genericname.ulf

@@ -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"

sysui/desktop/share/launcher_unityquicklist.ulf

@@ -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"