diff options
author | Heiko Tietze <tietze.heiko@gmail.com> | 2020-06-15 16:52:58 +0200 |
---|---|---|
committer | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2020-06-17 16:06:02 +0200 |
commit | a6718454e6a0ab6f7eb35c4b1f5d8234a704f554 (patch) | |
tree | 97d75547d569b0106eec6b5cda4f11ba68ee239c /extras | |
parent | 981b4e32933c9d3083f20bcb09ead4e4e2161768 (diff) |
Resolves tdf#132904 and tdf#133788 - Gallery clean-up
Rename
* sg1 -> bullets
* sg24 -> symbolshapes
* sg36 -> fontwork
Delete
* sg3 (backgrounds) -> 7273bb3534264867e818c13baffcdf3862189cd2
* sg4 (www-graf) -> 82ab7a1559170889c5647a04dc3e85edc38a4e0f
Translation
* ulf completed
Visibility
* New gallery content moved to share/
Change-Id: I718c627a71d4ed0d9eef61ff53814da7ec3922be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96382
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 86b1b062cfc2768a971bb842de1c16f8646d4b4b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96501
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'extras')
-rw-r--r-- | extras/Package_gallmytheme.mk | 21 | ||||
-rw-r--r-- | extras/Package_gallsystem.mk | 42 | ||||
-rw-r--r-- | extras/source/gallery/gallery_system/arrows.sdg (renamed from extras/source/gallery/gallery_mytheme/arrows.sdg) | bin | 403530 -> 403530 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/arrows.sdv (renamed from extras/source/gallery/gallery_mytheme/arrows.sdv) | bin | 304640 -> 304640 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/arrows.thm (renamed from extras/source/gallery/gallery_mytheme/arrows.thm) | bin | 1481 -> 1481 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/bpmn.sdg (renamed from extras/source/gallery/gallery_mytheme/bpmn.sdg) | bin | 609963 -> 609963 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/bpmn.sdv (renamed from extras/source/gallery/gallery_mytheme/bpmn.sdv) | bin | 418816 -> 418816 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/bpmn.thm (renamed from extras/source/gallery/gallery_mytheme/bpmn.thm) | bin | 2034 -> 2034 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/bullets.sdg (renamed from extras/source/gallery/gallery_system/sg1.sdg) | bin | 88215 -> 88215 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/bullets.sdv (renamed from extras/source/gallery/gallery_system/sg1.sdv) | bin | 2048 -> 2048 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/bullets.thm (renamed from extras/source/gallery/gallery_system/sg1.thm) | bin | 3665 -> 3665 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/diagrams.sdg (renamed from extras/source/gallery/gallery_mytheme/diagrams.sdg) | bin | 447774 -> 447774 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/diagrams.sdv (renamed from extras/source/gallery/gallery_mytheme/diagrams.sdv) | bin | 312832 -> 312832 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/diagrams.thm (renamed from extras/source/gallery/gallery_mytheme/diagrams.thm) | bin | 1423 -> 1423 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/flowchart.sdg (renamed from extras/source/gallery/gallery_mytheme/flowchart.sdg) | bin | 370124 -> 370124 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/flowchart.sdv (renamed from extras/source/gallery/gallery_mytheme/flowchart.sdv) | bin | 248832 -> 248832 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/flowchart.thm (renamed from extras/source/gallery/gallery_mytheme/flowchart.thm) | bin | 1484 -> 1484 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/fontwork.sdg (renamed from extras/source/gallery/gallery_system/sg36.sdg) | bin | 426992 -> 426992 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/fontwork.sdv (renamed from extras/source/gallery/gallery_system/sg36.sdv) | bin | 551424 -> 551424 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/fontwork.thm (renamed from extras/source/gallery/gallery_system/sg36.thm) | bin | 1103 -> 1103 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/icons.sdg (renamed from extras/source/gallery/gallery_mytheme/icons.sdg) | bin | 512212 -> 512212 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/icons.sdv (renamed from extras/source/gallery/gallery_mytheme/icons.sdv) | bin | 740352 -> 740352 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/icons.thm (renamed from extras/source/gallery/gallery_mytheme/icons.thm) | bin | 2755 -> 2755 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/network.sdg (renamed from extras/source/gallery/gallery_mytheme/network.sdg) | bin | 395134 -> 395134 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/network.sdv (renamed from extras/source/gallery/gallery_mytheme/network.sdv) | bin | 285184 -> 285184 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/network.thm (renamed from extras/source/gallery/gallery_mytheme/network.thm) | bin | 1392 -> 1392 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/sg3.sdg | bin | 232311 -> 0 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/sg3.sdv | bin | 2048 -> 0 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/sg3.thm | bin | 4547 -> 0 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/sg4.sdg | bin | 75854 -> 0 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/sg4.sdv | bin | 2048 -> 0 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/sg4.thm | bin | 3323 -> 0 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/shapes.sdg (renamed from extras/source/gallery/gallery_mytheme/shapes.sdg) | bin | 805843 -> 805843 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/shapes.sdv (renamed from extras/source/gallery/gallery_mytheme/shapes.sdv) | bin | 861184 -> 861184 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/shapes.thm (renamed from extras/source/gallery/gallery_mytheme/shapes.thm) | bin | 1931 -> 1931 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/symbolshapes.sdg (renamed from extras/source/gallery/gallery_system/sg24.sdg) | bin | 45786 -> 45786 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/symbolshapes.sdv (renamed from extras/source/gallery/gallery_system/sg24.sdv) | bin | 360960 -> 360960 bytes | |||
-rw-r--r-- | extras/source/gallery/gallery_system/symbolshapes.thm (renamed from extras/source/gallery/gallery_system/sg24.thm) | bin | 1236 -> 1236 bytes | |||
-rw-r--r-- | extras/source/gallery/share/gallery_names.ulf | 29 |
39 files changed, 40 insertions, 52 deletions
diff --git a/extras/Package_gallmytheme.mk b/extras/Package_gallmytheme.mk index c4e8744ddf44..88149916095d 100644 --- a/extras/Package_gallmytheme.mk +++ b/extras/Package_gallmytheme.mk @@ -12,25 +12,4 @@ $(eval $(call gb_Package_Package,extras_gallmytheme,$(SRCDIR)/extras/source/gall $(eval $(call gb_Package_add_files,extras_gallmytheme,$(LIBO_SHARE_PRESETS_FOLDER)/gallery,\ sg30.sdv \ sg30.thm \ - arrows.sdg \ - arrows.sdv \ - arrows.thm \ - bpmn.sdg \ - bpmn.sdv \ - bpmn.thm \ - flowchart.sdg \ - flowchart.sdv \ - flowchart.thm \ - icons.sdg \ - icons.sdv \ - icons.thm \ - shapes.sdg \ - shapes.sdv \ - shapes.thm \ - network.sdg \ - network.sdv \ - network.thm \ - diagrams.sdg \ - diagrams.sdv \ - diagrams.thm \ )) diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk index 1f499213afd1..c17099ce7050 100644 --- a/extras/Package_gallsystem.mk +++ b/extras/Package_gallsystem.mk @@ -10,18 +10,36 @@ $(eval $(call gb_Package_Package,extras_gallsystem,$(SRCDIR)/extras/source/gallery/gallery_system)) $(eval $(call gb_Package_add_files,extras_gallsystem,$(LIBO_SHARE_FOLDER)/gallery,\ - sg1.sdg \ - sg1.sdv \ - sg1.thm \ - sg4.sdg \ - sg4.sdv \ - sg4.thm \ - sg24.sdg \ - sg24.sdv \ - sg24.thm \ - sg36.sdg \ - sg36.sdv \ - sg36.thm \ + arrows.sdg \ + arrows.sdv \ + arrows.thm \ + bpmn.sdg \ + bpmn.sdv \ + bpmn.thm \ + bullets.sdg \ + bullets.sdv \ + bullets.thm \ + diagrams.sdg \ + diagrams.sdv \ + diagrams.thm \ + flowchart.sdg \ + flowchart.sdv \ + flowchart.thm \ + fontwork.sdg \ + fontwork.sdv \ + fontwork.thm \ + icons.sdg \ + icons.sdv \ + icons.thm \ + network.sdg \ + network.sdv \ + network.thm \ + shapes.sdg \ + shapes.sdv \ + shapes.thm \ + symbolshapes.sdg \ + symbolshapes.sdv \ + symbolshapes.thm \ )) # vim: set noet sw=4 ts=4: diff --git a/extras/source/gallery/gallery_mytheme/arrows.sdg b/extras/source/gallery/gallery_system/arrows.sdg Binary files differindex f73e8559507c..f73e8559507c 100644 --- a/extras/source/gallery/gallery_mytheme/arrows.sdg +++ b/extras/source/gallery/gallery_system/arrows.sdg diff --git a/extras/source/gallery/gallery_mytheme/arrows.sdv b/extras/source/gallery/gallery_system/arrows.sdv Binary files differindex 22150a07a7a7..22150a07a7a7 100644 --- a/extras/source/gallery/gallery_mytheme/arrows.sdv +++ b/extras/source/gallery/gallery_system/arrows.sdv diff --git a/extras/source/gallery/gallery_mytheme/arrows.thm b/extras/source/gallery/gallery_system/arrows.thm Binary files differindex 7a33a0751fae..7a33a0751fae 100644 --- a/extras/source/gallery/gallery_mytheme/arrows.thm +++ b/extras/source/gallery/gallery_system/arrows.thm diff --git a/extras/source/gallery/gallery_mytheme/bpmn.sdg b/extras/source/gallery/gallery_system/bpmn.sdg Binary files differindex e88a7fc5084f..e88a7fc5084f 100644 --- a/extras/source/gallery/gallery_mytheme/bpmn.sdg +++ b/extras/source/gallery/gallery_system/bpmn.sdg diff --git a/extras/source/gallery/gallery_mytheme/bpmn.sdv b/extras/source/gallery/gallery_system/bpmn.sdv Binary files differindex 0d701bad01e5..0d701bad01e5 100644 --- a/extras/source/gallery/gallery_mytheme/bpmn.sdv +++ b/extras/source/gallery/gallery_system/bpmn.sdv diff --git a/extras/source/gallery/gallery_mytheme/bpmn.thm b/extras/source/gallery/gallery_system/bpmn.thm Binary files differindex 110a5ef97610..110a5ef97610 100644 --- a/extras/source/gallery/gallery_mytheme/bpmn.thm +++ b/extras/source/gallery/gallery_system/bpmn.thm diff --git a/extras/source/gallery/gallery_system/sg1.sdg b/extras/source/gallery/gallery_system/bullets.sdg Binary files differindex d791d0cbe3d7..d791d0cbe3d7 100644 --- a/extras/source/gallery/gallery_system/sg1.sdg +++ b/extras/source/gallery/gallery_system/bullets.sdg diff --git a/extras/source/gallery/gallery_system/sg1.sdv b/extras/source/gallery/gallery_system/bullets.sdv Binary files differindex fc17dd9d0528..fc17dd9d0528 100644 --- a/extras/source/gallery/gallery_system/sg1.sdv +++ b/extras/source/gallery/gallery_system/bullets.sdv diff --git a/extras/source/gallery/gallery_system/sg1.thm b/extras/source/gallery/gallery_system/bullets.thm Binary files differindex 2e85213d023a..2e85213d023a 100644 --- a/extras/source/gallery/gallery_system/sg1.thm +++ b/extras/source/gallery/gallery_system/bullets.thm diff --git a/extras/source/gallery/gallery_mytheme/diagrams.sdg b/extras/source/gallery/gallery_system/diagrams.sdg Binary files differindex 57104cc19168..57104cc19168 100644 --- a/extras/source/gallery/gallery_mytheme/diagrams.sdg +++ b/extras/source/gallery/gallery_system/diagrams.sdg diff --git a/extras/source/gallery/gallery_mytheme/diagrams.sdv b/extras/source/gallery/gallery_system/diagrams.sdv Binary files differindex e025349bec0b..e025349bec0b 100644 --- a/extras/source/gallery/gallery_mytheme/diagrams.sdv +++ b/extras/source/gallery/gallery_system/diagrams.sdv diff --git a/extras/source/gallery/gallery_mytheme/diagrams.thm b/extras/source/gallery/gallery_system/diagrams.thm Binary files differindex 412bb6632c3d..412bb6632c3d 100644 --- a/extras/source/gallery/gallery_mytheme/diagrams.thm +++ b/extras/source/gallery/gallery_system/diagrams.thm diff --git a/extras/source/gallery/gallery_mytheme/flowchart.sdg b/extras/source/gallery/gallery_system/flowchart.sdg Binary files differindex 062e5cc11741..062e5cc11741 100644 --- a/extras/source/gallery/gallery_mytheme/flowchart.sdg +++ b/extras/source/gallery/gallery_system/flowchart.sdg diff --git a/extras/source/gallery/gallery_mytheme/flowchart.sdv b/extras/source/gallery/gallery_system/flowchart.sdv Binary files differindex afe65157d15d..afe65157d15d 100644 --- a/extras/source/gallery/gallery_mytheme/flowchart.sdv +++ b/extras/source/gallery/gallery_system/flowchart.sdv diff --git a/extras/source/gallery/gallery_mytheme/flowchart.thm b/extras/source/gallery/gallery_system/flowchart.thm Binary files differindex 800da4f6ef7d..800da4f6ef7d 100644 --- a/extras/source/gallery/gallery_mytheme/flowchart.thm +++ b/extras/source/gallery/gallery_system/flowchart.thm diff --git a/extras/source/gallery/gallery_system/sg36.sdg b/extras/source/gallery/gallery_system/fontwork.sdg Binary files differindex 65fc4f3bfb1b..65fc4f3bfb1b 100644 --- a/extras/source/gallery/gallery_system/sg36.sdg +++ b/extras/source/gallery/gallery_system/fontwork.sdg diff --git a/extras/source/gallery/gallery_system/sg36.sdv b/extras/source/gallery/gallery_system/fontwork.sdv Binary files differindex 51171313668d..51171313668d 100644 --- a/extras/source/gallery/gallery_system/sg36.sdv +++ b/extras/source/gallery/gallery_system/fontwork.sdv diff --git a/extras/source/gallery/gallery_system/sg36.thm b/extras/source/gallery/gallery_system/fontwork.thm Binary files differindex 8d80fe15f24a..8d80fe15f24a 100644 --- a/extras/source/gallery/gallery_system/sg36.thm +++ b/extras/source/gallery/gallery_system/fontwork.thm diff --git a/extras/source/gallery/gallery_mytheme/icons.sdg b/extras/source/gallery/gallery_system/icons.sdg Binary files differindex f135a13d9892..f135a13d9892 100644 --- a/extras/source/gallery/gallery_mytheme/icons.sdg +++ b/extras/source/gallery/gallery_system/icons.sdg diff --git a/extras/source/gallery/gallery_mytheme/icons.sdv b/extras/source/gallery/gallery_system/icons.sdv Binary files differindex cb6dfbb34530..cb6dfbb34530 100644 --- a/extras/source/gallery/gallery_mytheme/icons.sdv +++ b/extras/source/gallery/gallery_system/icons.sdv diff --git a/extras/source/gallery/gallery_mytheme/icons.thm b/extras/source/gallery/gallery_system/icons.thm Binary files differindex b26e8ee9e219..b26e8ee9e219 100644 --- a/extras/source/gallery/gallery_mytheme/icons.thm +++ b/extras/source/gallery/gallery_system/icons.thm diff --git a/extras/source/gallery/gallery_mytheme/network.sdg b/extras/source/gallery/gallery_system/network.sdg Binary files differindex 78701a42e87b..78701a42e87b 100644 --- a/extras/source/gallery/gallery_mytheme/network.sdg +++ b/extras/source/gallery/gallery_system/network.sdg diff --git a/extras/source/gallery/gallery_mytheme/network.sdv b/extras/source/gallery/gallery_system/network.sdv Binary files differindex b64111dcf12a..b64111dcf12a 100644 --- a/extras/source/gallery/gallery_mytheme/network.sdv +++ b/extras/source/gallery/gallery_system/network.sdv diff --git a/extras/source/gallery/gallery_mytheme/network.thm b/extras/source/gallery/gallery_system/network.thm Binary files differindex 5387602bdc63..5387602bdc63 100644 --- a/extras/source/gallery/gallery_mytheme/network.thm +++ b/extras/source/gallery/gallery_system/network.thm diff --git a/extras/source/gallery/gallery_system/sg3.sdg b/extras/source/gallery/gallery_system/sg3.sdg Binary files differdeleted file mode 100644 index 269e57253137..000000000000 --- a/extras/source/gallery/gallery_system/sg3.sdg +++ /dev/null diff --git a/extras/source/gallery/gallery_system/sg3.sdv b/extras/source/gallery/gallery_system/sg3.sdv Binary files differdeleted file mode 100644 index 444959152744..000000000000 --- a/extras/source/gallery/gallery_system/sg3.sdv +++ /dev/null diff --git a/extras/source/gallery/gallery_system/sg3.thm b/extras/source/gallery/gallery_system/sg3.thm Binary files differdeleted file mode 100644 index b81238c16477..000000000000 --- a/extras/source/gallery/gallery_system/sg3.thm +++ /dev/null diff --git a/extras/source/gallery/gallery_system/sg4.sdg b/extras/source/gallery/gallery_system/sg4.sdg Binary files differdeleted file mode 100644 index da114195d5e9..000000000000 --- a/extras/source/gallery/gallery_system/sg4.sdg +++ /dev/null diff --git a/extras/source/gallery/gallery_system/sg4.sdv b/extras/source/gallery/gallery_system/sg4.sdv Binary files differdeleted file mode 100644 index fc17dd9d0528..000000000000 --- a/extras/source/gallery/gallery_system/sg4.sdv +++ /dev/null diff --git a/extras/source/gallery/gallery_system/sg4.thm b/extras/source/gallery/gallery_system/sg4.thm Binary files differdeleted file mode 100644 index 91b9ba32df7e..000000000000 --- a/extras/source/gallery/gallery_system/sg4.thm +++ /dev/null diff --git a/extras/source/gallery/gallery_mytheme/shapes.sdg b/extras/source/gallery/gallery_system/shapes.sdg Binary files differindex 6ac7113be618..6ac7113be618 100644 --- a/extras/source/gallery/gallery_mytheme/shapes.sdg +++ b/extras/source/gallery/gallery_system/shapes.sdg diff --git a/extras/source/gallery/gallery_mytheme/shapes.sdv b/extras/source/gallery/gallery_system/shapes.sdv Binary files differindex d19fbf155db4..d19fbf155db4 100644 --- a/extras/source/gallery/gallery_mytheme/shapes.sdv +++ b/extras/source/gallery/gallery_system/shapes.sdv diff --git a/extras/source/gallery/gallery_mytheme/shapes.thm b/extras/source/gallery/gallery_system/shapes.thm Binary files differindex 57ff7f085cbf..57ff7f085cbf 100644 --- a/extras/source/gallery/gallery_mytheme/shapes.thm +++ b/extras/source/gallery/gallery_system/shapes.thm diff --git a/extras/source/gallery/gallery_system/sg24.sdg b/extras/source/gallery/gallery_system/symbolshapes.sdg Binary files differindex 7441d764cb37..7441d764cb37 100644 --- a/extras/source/gallery/gallery_system/sg24.sdg +++ b/extras/source/gallery/gallery_system/symbolshapes.sdg diff --git a/extras/source/gallery/gallery_system/sg24.sdv b/extras/source/gallery/gallery_system/symbolshapes.sdv Binary files differindex d946d31c0f8d..d946d31c0f8d 100644 --- a/extras/source/gallery/gallery_system/sg24.sdv +++ b/extras/source/gallery/gallery_system/symbolshapes.sdv diff --git a/extras/source/gallery/gallery_system/sg24.thm b/extras/source/gallery/gallery_system/symbolshapes.thm Binary files differindex b821a9de8bb2..b821a9de8bb2 100644 --- a/extras/source/gallery/gallery_system/sg24.thm +++ b/extras/source/gallery/gallery_system/symbolshapes.thm diff --git a/extras/source/gallery/share/gallery_names.ulf b/extras/source/gallery/share/gallery_names.ulf index 0d1da8dbec8a..f013ce7b351f 100644 --- a/extras/source/gallery/share/gallery_names.ulf +++ b/extras/source/gallery/share/gallery_names.ulf @@ -13,34 +13,25 @@ en-US = "Arrows" [backgrounds] en-US = "Backgrounds" -[computers] -en-US = "Computers" +[bpmn] +en-US = "BPMN" [diagrams] en-US = "Diagrams" -[education] -en-US = "School & University" +[flowchart] +en-US = "Flow chart" -[environment] -en-US = "Environment" +[icons] +en-US = "Icons" -[finance] -en-US = "Finance" +[network] +en-US = "Network" -[people] -en-US = "People" +[shapes] +en-US = "Shapes" [sounds] en-US = "Sounds" -[symbols] -en-US = "Symbols" - -[txtshapes] -en-US = "Text Shapes" - -[transportation] -en-US = "Transportation" - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |