Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/bootstrap

scp2/source/ooo/directory_ooo.scp

@@ -975,6 +975,11 @@ Directory gid_Dir_Share_Template_Wizard
     DosName = "wizard";
 End
 
+Directory gid_Dir_Share_Template_Wizard_Bitmap
+    ParentID = gid_Dir_Share_Template_Wizard;
+    DosName = "bitmap";
+End
+
 Directory gid_Dir_Share_Template_Wizard_Letter
     ParentID = gid_Dir_Share_Template_Wizard;
     DosName = "letter";
@@ -1035,11 +1040,6 @@ Directory gid_Dir_Template_Wizard
     DIR_IDENT_ALL_LANG(wizard);
 End
 
-Directory gid_Dir_Template_Wizard_Bitmap
-    ParentID = gid_Dir_Template_Wizard;
-    DIR_IDENT_ALL_LANG(bitmap);
-End
-
 Directory gid_Dir_Template_Wizard_Web
     ParentID = gid_Dir_Template_Wizard;
     DIR_IDENT_ALL_LANG(web);

scp2/source/ooo/file_extra_ooo.scp

@@ -365,10 +365,9 @@ File gid_File_Extra_Tplpresntimpr_Lang
 End
 
 File gid_File_Extra_Tplwizbitmap
-    Dir = gid_Dir_Template_Wizard_Bitmap;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_IDENT_ALL_LANG(tplwizbitmap.zip);
+    Dir = gid_Dir_Share_Template_Wizard_Bitmap;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "tplwizbitmap.zip";
 End
 
 File gid_File_Extra_Tplwizdesktop_Lang

scp2/source/ooo/module_hidden_ooo.scp

@@ -454,6 +454,7 @@ Module gid_Module_Root_Files_6
 	gid_File_Extra_Gallwwwgraf,
 	gid_File_Extra_Migration,
 	gid_File_Extra_Migration_Lang_Multi,
+	gid_File_Extra_Tplwizbitmap,
 	gid_File_Extra_Tplwizletter,
 	gid_File_Extra_Tplwizletter_en_US,
 	gid_File_Extra_Tplwizletter_de,

scp2/source/ooo/module_lang_template.scp

@@ -35,7 +35,6 @@ Module gid_Module_Langpack_Basis_Template
              gid_File_Extra_Tpllayoutimpr_Lang,
              gid_File_Extra_Tplpresntimpr_Lang,
              gid_File_Extra_Tplwizagenda_Lang,
-             gid_File_Extra_Tplwizbitmap,
              gid_File_Extra_Tplwizdesktop_Lang,
              gid_File_Extra_Tplwizfax_Lang,
              gid_File_Extra_Tplwizletter_Lang,