Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=2b37f1d0f5883f97681c3ff8d45ae17ca13e57ab
commit 2b37f1d0f5883f97681c3ff8d45ae17ca13e57ab Author: crazy <[email protected]> Date: Mon Aug 28 02:25:26 2017 +0200 branding: some work * remove these old images we need new ones * some fixes for qml and desc file * added other logo png diff --git a/calamares/calamares-frugalware-branding/Fluxbox_Tommfa.jpg b/calamares/calamares-frugalware-branding/Fluxbox_Tommfa.jpg deleted file mode 100644 index e3faf91..0000000 Binary files a/calamares/calamares-frugalware-branding/Fluxbox_Tommfa.jpg and /dev/null differ diff --git a/calamares/calamares-frugalware-branding/FrugalWare.svg b/calamares/calamares-frugalware-branding/FrugalWare.svg new file mode 100644 index 0000000..5f6a797 --- /dev/null +++ b/calamares/calamares-frugalware-branding/FrugalWare.svg @@ -0,0 +1,28 @@ +<svg xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; version="1.0" viewBox="-12 -12 280 280"> + <title>FrugalWare</title> + <defs> + <radialGradient id="a"> + <stop offset="0" stop-color="#fff" stop-opacity="1"/> + <stop offset="1" stop-color="#fff" stop-opacity="0.2"/> + </radialGradient> + <filter id="b"> + <feGaussianBlur stdDeviation="4" in="SourceAlpha" result="a"/> + <feOffset in="a" result="b" dx="1" dy="1"/> + <feColorMatrix type="matrix" in="b" result="c" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/> + <feMerge> + <feMergeNode in="c"/> + <feMergeNode in="SourceGraphic"/> + </feMerge> + </filter> + <mask id="c"> + <rect x="0" y="0" width="256" height="256" rx="24" ry="24" fill="#fff"/> + </mask> + </defs> + <a xlink:href="http://frugalware.org"; target="_top"> + <rect x="0" y="0" width="256" height="256" rx="24" ry="24" fill="#99b8cd" filter="url(#b)"/> + <rect x="0" y="0" width="208" height="208" rx="8" ry="8" fill="#3f7ebf" filter="url(#b)" transform="translate(56, -1) rotate(16)"/> + <rect x="48" y="48" width="160" height="160" rx="10" ry="10" fill="#0f4c94" filter="url(#b)"/> + <circle cx="64" cy="-224" r="384" fill="url(#a)" mask="url(#c)"/> + <path d="M0,0 h96 v28 h-56 v24 h48 v28 h-48 v40 h-40 z" fill="#c1cfd8" stroke="#000" transform="translate(92, 80) scale(0.8)"/> + </a> +</svg> \ No newline at end of file diff --git a/calamares/calamares-frugalware-branding/KDE_Melko.jpg b/calamares/calamares-frugalware-branding/KDE_Melko.jpg deleted file mode 100644 index 175143c..0000000 Binary files a/calamares/calamares-frugalware-branding/KDE_Melko.jpg and /dev/null differ diff --git a/calamares/calamares-frugalware-branding/branding.desc b/calamares/calamares-frugalware-branding/branding.desc index d615f6e..b02637e 100644 --- a/calamares/calamares-frugalware-branding/branding.desc +++ b/calamares/calamares-frugalware-branding/branding.desc @@ -8,15 +8,15 @@ strings: shortVersion: _version_ versionedName: _versionedname_ shortVersionedName: FrugalWare _version_ - bootloaderEntryName: FrugalWare + bootloaderEntryName: frugalware productUrl: https://www.frugalware.org supportUrl: https://bugs.frugalware.org knownIssuesUrl: https://bugs.frugalware.org releaseNotesUrl: https://bugs.frugalware.org images: - productLogo: "frugalware-logo.png" - productIcon: "calamares-frugalware.svg" + productLogo: "fw.png" + productIcon: "fw.png" productWelcome: "languages.png" slideshow: "show.qml" @@ -25,3 +25,4 @@ style: sidebarBackground: "#292F34" sidebarText: "#FFFFFF" sidebarTextSelect: "#292F34" + sidebarTextHighlight: "#FFFFF0" diff --git a/calamares/calamares-frugalware-branding/calamares-frugalware.svg b/calamares/calamares-frugalware-branding/calamares-frugalware.svg deleted file mode 100644 index 01acaeb..0000000 --- a/calamares/calamares-frugalware-branding/calamares-frugalware.svg +++ /dev/null @@ -1,399 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://creativecommons.org/ns#"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; - xmlns:xlink="http://www.w3.org/1999/xlink"; - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; - width="51.200001" - height="51.200001" - id="svg5453" - version="1.1" - inkscape:version="0.92.1 r" - sodipodi:docname="calamares-frugalware.svg" - inkscape:export-filename="/home/jamboarder/Projects/KDE VDG/Calamares/calamares-icon-2.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - viewBox="0 0 48 48"> - <defs - id="defs5455"> - <linearGradient - id="linearGradient5623"> - <stop - id="stop5625" - offset="0" - style="stop-color:#d35400;stop-opacity:1;" /> - <stop - style="stop-color:#d35400;stop-opacity:1;" - offset="1" - id="stop5627" /> - </linearGradient> - <linearGradient - id="linearGradient3819"> - <stop - style="stop-color:#eff0f1;stop-opacity:1;" - offset="0" - id="stop3821" /> - <stop - style="stop-color:#bdc3c7;stop-opacity:1;" - offset="1" - id="stop3823" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3819" - id="linearGradient3825" - x1="24" - y1="20" - x2="24" - y2="43.999973" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(384.57143,499.798)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4227" - id="linearGradient3843" - x1="10" - y1="36" - x2="15" - y2="41" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(384.57143,500.798)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4227" - id="linearGradient3847" - gradientUnits="userSpaceOnUse" - x1="9.9047623" - y1="36" - x2="14.90477" - y2="41.000008" - gradientTransform="translate(398.66666,500.798)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5623" - id="linearGradient3948" - x1="25.065147" - y1="33.843651" - x2="25" - y2="10" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.0833332,384.57143,492.96467)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4227" - id="linearGradient3080" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.3793103,0,0,1.3793103,384.81281,499.0393)" - x1="8.5250006" - y1="7.8000579" - x2="25.200001" - y2="25.200058" /> - <linearGradient - id="linearGradient4227" - inkscape:collect="always"> - <stop - id="stop4229" - offset="0" - style="stop-color:#292c2f;stop-opacity:1" /> - <stop - id="stop4231" - offset="1" - style="stop-color:#000000;stop-opacity:0;" /> - </linearGradient> - <filter - style="color-interpolation-filters:sRGB" - id="filter3845" - inkscape:label="Drop Shadow"> - <feFlood - id="feFlood3847" - flood-opacity="0.5" - flood-color="rgb(0,0,0)" - result="flood" /> - <feComposite - id="feComposite3849" - in2="SourceGraphic" - in="flood" - operator="in" - result="composite1" /> - <feGaussianBlur - id="feGaussianBlur3851" - stdDeviation="6" - result="blur" /> - <feOffset - id="feOffset3853" - dx="0" - dy="4" - result="offset" /> - <feComposite - id="feComposite3855" - in2="offset" - in="SourceGraphic" - operator="over" - result="composite2" /> - </filter> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="5.427043" - inkscape:cx="-0.29007461" - inkscape:cy="48.206945" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="true" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - inkscape:window-width="1920" - inkscape:window-height="1051" - inkscape:window-x="1920" - inkscape:window-y="0" - inkscape:window-maximized="1" - inkscape:showpageshadow="false" - borderlayer="true" - showguides="true" - inkscape:snap-global="true" - inkscape:snap-nodes="true" - inkscape:snap-bbox="true" - inkscape:bbox-nodes="true" - inkscape:object-nodes="true"> - <inkscape:grid - type="xygrid" - id="grid4063" - empspacing="4" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" - originx="0" - originy="0" - spacingx="1" - spacingy="1" /> - <sodipodi:guide - position="1.1650391e-05,47.999995" - orientation="4,0" - id="guide4146" - inkscape:locked="false" /> - <sodipodi:guide - position="1.1650391e-05,43.999995" - orientation="0,48" - id="guide4148" - inkscape:locked="false" /> - <sodipodi:guide - position="48.000011,43.999995" - orientation="-4,0" - id="guide4150" - inkscape:locked="false" /> - <sodipodi:guide - position="1.1650391e-05,4.0000263" - orientation="4,0" - id="guide4154" - inkscape:locked="false" /> - <sodipodi:guide - position="1.1650391e-05,2.6367188e-05" - orientation="0,48" - id="guide4156" - inkscape:locked="false" /> - <sodipodi:guide - position="48.000011,2.6367188e-05" - orientation="-4,0" - id="guide4158" - inkscape:locked="false" /> - <sodipodi:guide - position="48.000011,4.0000263" - orientation="0,-48" - id="guide4160" - inkscape:locked="false" /> - <sodipodi:guide - position="48.000011,48.000025" - orientation="0,-4" - id="guide4162" - inkscape:locked="false" /> - <sodipodi:guide - position="44.000011,48.000025" - orientation="48,0" - id="guide4164" - inkscape:locked="false" /> - <sodipodi:guide - position="44.000011,2.6367188e-05" - orientation="0,4" - id="guide4166" - inkscape:locked="false" /> - <sodipodi:guide - position="48.000011,2.6367188e-05" - orientation="-48,0" - id="guide4168" - inkscape:locked="false" /> - <sodipodi:guide - position="4.0000421,48.000025" - orientation="0,-4" - id="guide4170" - inkscape:locked="false" /> - <sodipodi:guide - position="4.2167968e-05,48.000025" - orientation="48,0" - id="guide4172" - inkscape:locked="false" /> - <sodipodi:guide - position="4.2167968e-05,2.6367188e-05" - orientation="0,4" - id="guide4174" - inkscape:locked="false" /> - <sodipodi:guide - position="4.0000421,2.6367188e-05" - orientation="-48,0" - id="guide4176" - inkscape:locked="false" /> - <sodipodi:guide - position="4.0000116,47.999995" - orientation="43.999969,0" - id="guide4638" - inkscape:locked="false" /> - <sodipodi:guide - position="4.0000116,4.0000263" - orientation="0,20" - id="guide4640" - inkscape:locked="false" /> - <sodipodi:guide - position="24.000012,47.999995" - orientation="0,-20" - id="guide4644" - inkscape:locked="false" /> - <sodipodi:guide - position="4.0000421,24.000026" - orientation="20,0" - id="guide4666" - inkscape:locked="false" /> - <sodipodi:guide - position="4.0000421,4.0000263" - orientation="0,39.999969" - id="guide4668" - inkscape:locked="false" /> - <sodipodi:guide - position="44.000011,4.0000263" - orientation="-20,0" - id="guide4670" - inkscape:locked="false" /> - </sodipodi:namedview> - <metadata - id="metadata5458"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Capa 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-384.57143,-499.798)"> - <rect - style="fill:url(#linearGradient3948);fill-opacity:1;stroke:none" - id="rect3936" - width="32" - height="25.999996" - x="392.57144" - y="503.798" - ry="0" /> - <path - style="opacity:0.2;fill:#232629;fill-opacity:1;stroke:none" - d="m 408.57143,533.798 c -1.662,0 -3,1.338 -3,3 0,1.662 1.338,3 3,3 1.30536,0 2.39817,-0.84052 2.8125,-2 h 8.375 c 0.41433,1.15948 1.50714,2 2.8125,2 1.662,0 3,-1.338 3,-3 0,-1.662 -1.338,-3 -3,-3 -1.30536,0 -2.39817,0.84052 -2.8125,2 h -8.375 c -0.41433,-1.15948 -1.50714,-2 -2.8125,-2 z" - id="path3911" - inkscape:connector-curvature="0" /> - <path - style="fill:url(#linearGradient3825);fill-opacity:1;stroke:none" - d="m 388.57144,529.798 -10e-6,14 h 40 l 10e-6,-14 z" - id="rect3804" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ccccc" /> - <path - inkscape:connector-curvature="0" - id="path3829" - d="m 411.38393,537.798 h 8.375 c 0.41433,1.15948 1.50714,2 2.8125,2 1.662,0 3,-1.338 3,-3 0,-1.662 -1.338,-3 -3,-3 -1.30536,0 -2.39817,0.84052 -2.8125,2 h -8.375 c 0.1875,1 0.1875,1 0,2 z" - style="opacity:0.77876108;fill:#4d4d4d;fill-opacity:1;stroke:none" - sodipodi:nodetypes="ccsssccc" /> - <path - sodipodi:nodetypes="ccccc" - inkscape:connector-curvature="0" - id="path3845" - d="m 406.66666,539.13133 4.76191,4.66667 h 8.14286 l -9.14286,-9.42857 z" - style="opacity:0.2;fill:url(#linearGradient3847);fill-opacity:1;stroke:none" /> - <path - style="opacity:0.2;fill:url(#linearGradient3843);fill-opacity:1;stroke:none" - d="m 392.57143,539.13133 4.61905,4.66667 h 13.38095 l -4.86671,-6.9365 -7.13329,-0.0675 -2.23809,-2.42461 z" - id="path3835" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ccccccc" /> - <path - style="fill:#d35400;fill-opacity:1;stroke:none" - d="m 394.57143,533.798 c -1.662,0 -3,1.338 -3,3 0,1.662 1.338,3 3,3 1.30536,0 2.39817,-0.84052 2.8125,-2 h 8.375 c 0.41433,1.15948 1.50714,2 2.8125,2 1.662,0 3,-1.338 3,-3 0,-1.662 -1.338,-3 -3,-3 -1.30536,0 -2.39817,0.84052 -2.8125,2 h -8.375 c -0.41433,-1.15948 -1.50714,-2 -2.8125,-2 z" - id="rect3812" - inkscape:connector-curvature="0" /> - <rect - ry="0" - y="542.79797" - x="388.57147" - height="0.99997008" - width="39.999954" - id="rect3827" - style="fill:#95a5a6;fill-opacity:1;stroke:none" /> - <rect - style="fill:#eff0f1;fill-opacity:1;stroke:none" - id="rect3855" - width="39.999969" - height="1.0000263" - x="388.57147" - y="529.79797" - ry="0" /> - <path - inkscape:connector-curvature="0" - style="opacity:0.2;fill:url(#linearGradient3080);fill-opacity:1;fill-rule:evenodd;stroke:none" - d="m 409.57143,513.798 v 1 l -1,9 20.00001,19 v 0 0 l -10e-6,-1 10e-6,-13 -19.00001,-19 z" - id="path4184" - sodipodi:nodetypes="cccccccccc" /> - <path - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#fcfcfc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" - d="m 406.57143,509.798 v 10 l -4.5,-4.5 -1.5,1.5 7,7 7,-7 -1.5,-1.5 -4.5,4.5 v -10 z" - id="path3938" - inkscape:connector-curvature="0" /> - <g - id="g3862" - transform="matrix(0.07257427,0,0,0.07857465,405.44841,485.92303)"> - <path - id="path2985" - d="m 190.84375,199.21875 c -70.69245,0 -128,57.30755 -128,128 0,70.69245 57.30755,128 128,128 70.69245,0 128,-57.30755 128,-128 0,-70.69245 -57.30755,-128 -128,-128 z m -64.5625,54.65625 h 127.75 c 6.71549,0 12.125,5.40951 12.125,12.125 v 127.75 c 0,6.71549 -5.40951,12.125 -12.125,12.125 h -127.75 c -6.71549,0 -12.125,-5.40951 -12.125,-12.125 V 266 c 0,-6.71549 5.40951,-12.125 12.125,-12.125 z" - clip-path="none" - style="fill:#00548b;fill-opacity:1;stroke:#143b69;stroke-width:1.04186046;stroke-opacity:1;filter:url(#filter3845)" - inkscape:connector-curvature="0" /> - <g - id="layer4" - transform="matrix(3.0576213,0,0,3.0576213,43.189537,180.55344)"> - <path - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#143b69;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - id="path3914" - d="M 36,31.03125 A 0.95511873,0.95511873 0 0 0 35.03125,32 V 66 A 0.95511873,0.95511873 0 0 0 36,66.96875 H 46 A 0.95511873,0.95511873 0 0 0 46.96875,66 V 54.96875 H 58 A 0.95511873,0.95511873 0 0 0 58.96875,54 V 46 A 0.95511873,0.95511873 0 0 0 58,45.03125 H 46.96875 v -4.0625 H 62 A 0.95511873,0.95511873 0 0 0 62.96875,40 V 32 A 0.95511873,0.95511873 0 0 0 62,31.03125 Z" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00548b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - id="rect2922" - inkscape:connector-curvature="0" - d="M 36,32 V 66 H 46 V 54 H 58 V 46 H 46 v -6 h 16 v -8 z" /> - </g> - </g> - </g> -</svg> diff --git a/calamares/calamares-frugalware-branding/frugalware-logo.png b/calamares/calamares-frugalware-branding/frugalware-logo.png deleted file mode 100644 index 54b5819..0000000 Binary files a/calamares/calamares-frugalware-branding/frugalware-logo.png and /dev/null differ diff --git a/calamares/calamares-frugalware-branding/fw.png b/calamares/calamares-frugalware-branding/fw.png new file mode 100644 index 0000000..dece3e1 Binary files /dev/null and b/calamares/calamares-frugalware-branding/fw.png differ diff --git a/calamares/calamares-frugalware-branding/i3_PacMiam.jpg b/calamares/calamares-frugalware-branding/i3_PacMiam.jpg deleted file mode 100644 index 8121b2f..0000000 Binary files a/calamares/calamares-frugalware-branding/i3_PacMiam.jpg and /dev/null differ diff --git a/calamares/calamares-frugalware-branding/i3_botchikii.jpg b/calamares/calamares-frugalware-branding/i3_botchikii.jpg deleted file mode 100644 index ad1068a..0000000 Binary files a/calamares/calamares-frugalware-branding/i3_botchikii.jpg and /dev/null differ diff --git a/calamares/calamares-frugalware-branding/show.qml b/calamares/calamares-frugalware-branding/show.qml index 6f7f035..d594594 100644 --- a/calamares/calamares-frugalware-branding/show.qml +++ b/calamares/calamares-frugalware-branding/show.qml @@ -24,7 +24,7 @@ Presentation id: presentation Timer { - interval: 20000 + interval: 30000 running: true repeat: true onTriggered: presentation.goToNextSlide() @@ -46,7 +46,7 @@ Presentation "FrugalWare Linux is driven by a hardworking and dedicated community.<br/>"+ "During the installation, this slideshow will provide a quick introduction." wrapMode: Text.WordWrap - width: 600 + width: root.width horizontalAlignment: Text.Center } } @@ -55,7 +55,7 @@ Presentation Image { id: background2 - source: "Fluxbox_Tommfa.jpg" + source: "official_background.jpg" width: 600; height: 332 fillMode: Image.PreserveAspectFit anchors.centerIn: parent @@ -67,7 +67,7 @@ Presentation "to exactly how you want it. From theming, to the very<br/>"+ "kernel itself, it can be changed." wrapMode: Text.WordWrap - width: 600 + width: root.width horizontalAlignment: Text.Center } } @@ -76,7 +76,7 @@ Presentation Image { id: background3 - source: "i3_botchikii.jpg" + source: "official_background.jpg" width: 600; height: 332 fillMode: Image.PreserveAspectFit anchors.centerIn: parent @@ -88,7 +88,7 @@ Presentation "Additionally, there's a multitude of community editions to <br/>"+ "choose from, built by the community, for the community." wrapMode: Text.WordWrap - width: 600 + width: root.width horizontalAlignment: Text.Center } } @@ -97,7 +97,7 @@ Presentation Image { id: background4 - source: "i3_PacMiam.jpg" + source: "official_background.jpg" width: 600; height: 332 fillMode: Image.PreserveAspectFit anchors.centerIn: parent @@ -108,7 +108,7 @@ Presentation text: "FrugalWare Linux uses a derived version of the orignal <br/>"+ "pacman from Arch Linux called pacman-g2." wrapMode: Text.WordWrap - width: 600 + width: root.width horizontalAlignment: Text.Center } } @@ -117,7 +117,7 @@ Presentation Image { id: background5 - source: "KDE_Melko.jpg" + source: "official_background.jpg" width: 600; height: 332 fillMode: Image.PreserveAspectFit anchors.centerIn: parent @@ -129,7 +129,7 @@ Presentation "it as much as we do making it! If you have any questions<br/>"+ "or feedback, please feel free to visit the forum, IRC, or wiki." wrapMode: Text.WordWrap - width: 600 + width: root.width horizontalAlignment: Text.Center } } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
