AllLangPackage_html_media_lang.mk |   23 ++++++++++++
 Package_html_media.mk             |   69 --------------------------------------
 2 files changed, 23 insertions(+), 69 deletions(-)

New commits:
commit 191058eba782a34dad89959d5a20d6f2edd4bc3a
Author:     Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Tue Jan 14 13:58:31 2020 -0300
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Thu Jan 16 01:53:08 2020 +0100

    tdf#129604 Place localized images in right makefile
    
    Change-Id: Ia0b9328d218b4a59a6483f3468c163ec82329d99
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/86793
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/AllLangPackage_html_media_lang.mk 
b/AllLangPackage_html_media_lang.mk
index e59ecffdb..c1987dc02 100644
--- a/AllLangPackage_html_media_lang.mk
+++ b/AllLangPackage_html_media_lang.mk
@@ -241,6 +241,29 @@ $(foreach lang,$(filter-out en-US,$(gb_HELP_LANGS)),$(eval 
$(call gb_AllLangPack
     screenshots/modules/smath/ui/fonttypedialog/$(lang)/FontsDialog.png \
     
screenshots/modules/smath/ui/savedefaultsdialog/$(lang)/SaveDefaultsDialog.png \
     screenshots/modules/smath/ui/spacingdialog/$(lang)/SpacingDialog.png \
+    
screenshots/modules/simpress/ui/optimpressgeneralpage/$(lang)/OptSavePage.png \
+    screenshots/cui/ui/optviewpage/$(lang)/OptViewPage.png \
+    screenshots/cui/ui/optfltrpage/$(lang)/OptFltrPage.png \
+    screenshots/cui/ui/opthtmlpage/$(lang)/OptHtmlPage.png \
+    screenshots/cui/ui/optaccessibilitypage/$(lang)/OptAccessibilityPage.png \
+    screenshots/cui/ui/optsavepage/$(lang)/OptSavePage.png \
+    screenshots/cui/ui/optadvancedpage/$(lang)/OptAdvancedPage.png \
+    screenshots/cui/ui/optasianpage/$(lang)/OptAsianPage.png \
+    screenshots/cui/ui/optctlpage/$(lang)/OptCTLPage.png \
+    screenshots/cui/ui/optsecuritypage/$(lang)/OptSecurityPage.png \
+    screenshots/cui/ui/effectspage/$(lang)/EffectsPage.png \
+    screenshots/cui/ui/hyperlinkdocpage/$(lang)/HyperlinkDocPage.png \
+    screenshots/cui/ui/hyperlinkinternetpage/$(lang)/HyperlinkInternetPage.png 
\
+    screenshots/cui/ui/hyperlinkmailpage/$(lang)/HyperlinkMailPage.png \
+    screenshots/cui/ui/hyperlinknewdocpage/$(lang)/HyperlinkNewDocPage.png \
+    screenshots/cui/ui/optlanguagespage/$(lang)/OptLanguagesPage.png \
+    screenshots/cui/ui/optgeneralpage/$(lang)/OptGeneralPage.png \
+    screenshots/filter/ui/pdfgeneralpage/$(lang)/PdfGeneralPage.png \
+    screenshots/filter/ui/pdflinkspage/$(lang)/PdfLinksPage.png \
+    screenshots/filter/ui/pdfviewpage/$(lang)/PdfViewPage.png \
+    
screenshots/filter/ui/pdfuserinterfacepage/$(lang)/PdfUserInterfacePage.png \
+    screenshots/filter/ui/pdfsignpage/$(lang)/PdfSignPage.png \
+    screenshots/filter/ui/pdfsecuritypage/$(lang)/PdfSecurityPage.png \
     screenshots/svx/ui/compressgraphicdialog/$(lang)/CompressGraphicDialog.png 
\
 )))
 #TODO: Find a clever way to pick en-US files (default) when localized files 
are missing
diff --git a/Package_html_media.mk b/Package_html_media.mk
index 7d71cd12a..b828c10dd 100644
--- a/Package_html_media.mk
+++ b/Package_html_media.mk
@@ -332,96 +332,27 @@ $(eval $(call 
gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
     screenshots/modules/swriter/ui/watermarkdialog/WatermarkDialog.png \
     screenshots/svx/ui/compressgraphicdialog/CompressGraphicDialog.png \
     screenshots/modules/simpress/ui/optimpressgeneralpage/OptSavePage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               
screenshots/modules/simpress/ui/optimpressgeneralpage/$(lang)/OptSavePage.png \
-       ) \
     screenshots/cui/ui/optviewpage/OptViewPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               screenshots/cui/ui/optviewpage/$(lang)/OptViewPage.png \
-       ) \
     screenshots/cui/ui/optfltrpage/OptFltrPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               screenshots/cui/ui/optfltrpage/$(lang)/OptFltrPage.png \
-       ) \
     screenshots/cui/ui/opthtmlpage/OptHtmlPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               screenshots/cui/ui/opthtmlpage/$(lang)/OptHtmlPage.png \
-       ) \
     screenshots/cui/ui/optaccessibilitypage/OptAccessibilityPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               
screenshots/cui/ui/optaccessibilitypage/$(lang)/OptAccessibilityPage.png \
-       ) \
     screenshots/cui/ui/optsavepage/OptSavePage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               screenshots/cui/ui/optsavepage/$(lang)/OptSavePage.png \
-       ) \
     screenshots/cui/ui/optadvancedpage/OptAdvancedPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               screenshots/cui/ui/optadvancedpage/$(lang)/OptAdvancedPage.png \
-       ) \
     screenshots/cui/ui/optasianpage/OptAsianPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               screenshots/cui/ui/optasianpage/$(lang)/OptAsianPage.png \
-       ) \
     screenshots/cui/ui/optctlpage/OptCTLPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               screenshots/cui/ui/optctlpage/$(lang)/OptCTLPage.png \
-       ) \
     screenshots/cui/ui/optsecuritypage/OptSecurityPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               screenshots/cui/ui/optsecuritypage/$(lang)/OptSecurityPage.png \
-       ) \
     screenshots/cui/ui/effectspage/EffectsPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               screenshots/cui/ui/effectspage/$(lang)/EffectsPage.png \
-       ) \
     screenshots/cui/ui/hyperlinkdocpage/HyperlinkDocPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               
screenshots/cui/ui/hyperlinkdocpage/$(lang)/HyperlinkDocPage.png \
-       ) \
     screenshots/cui/ui/hyperlinkinternetpage/HyperlinkInternetPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               
screenshots/cui/ui/hyperlinkinternetpage/$(lang)/HyperlinkInternetPage.png \
-       ) \
     screenshots/cui/ui/hyperlinkmailpage/HyperlinkMailPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               
screenshots/cui/ui/hyperlinkmailpage/$(lang)/HyperlinkMailPage.png \
-       ) \
     screenshots/cui/ui/hyperlinknewdocpage/HyperlinkNewDocPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               
screenshots/cui/ui/hyperlinknewdocpage/$(lang)/HyperlinkNewDocPage.png \
-       ) \
     screenshots/cui/ui/optlanguagespage/OptLanguagesPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               
screenshots/cui/ui/optlanguagespage/$(lang)/OptLanguagesPage.png \
-       ) \
     screenshots/cui/ui/optgeneralpage/OptGeneralPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               screenshots/cui/ui/optgeneralpage/$(lang)/OptGeneralPage.png \
-       ) \
     screenshots/filter/ui/pdfgeneralpage/PdfGeneralPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               screenshots/filter/ui/pdfgeneralpage/$(lang)/PdfGeneralPage.png 
\
-       ) \
     screenshots/filter/ui/pdflinkspage/PdfLinksPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               screenshots/filter/ui/pdflinkspage/$(lang)/PdfLinksPage.png \
-       ) \
     screenshots/filter/ui/pdfviewpage/PdfViewPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               screenshots/filter/ui/pdfviewpage/$(lang)/PdfViewPage.png \
-       ) \
     screenshots/filter/ui/pdfuserinterfacepage/PdfUserInterfacePage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               
screenshots/filter/ui/pdfuserinterfacepage/$(lang)/PdfUserInterfacePage.png \
-       ) \
     screenshots/filter/ui/pdfsignpage/PdfSignPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               screenshots/filter/ui/pdfsignpage/$(lang)/PdfSignPage.png \
-       ) \
     screenshots/filter/ui/pdfsecuritypage/PdfSecurityPage.png \
-    $(foreach lang, $(filter-out en-US,$(gb_HELP_LANGS)),\
-               
screenshots/filter/ui/pdfsecuritypage/$(lang)/PdfSecurityPage.png \
-       ) \
 ))
 # vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to