Merge tag 'upstream/0.23.1'

Upstream version 0.23.1

9 files changed, 0 insertions, 600 deletions

diff --git a/icons/filter-flagged.png b/icons/filter-flagged.png
index ad5db78..ad5db78 100755..100644
--- a/icons/filter-flagged.png
+++ b/icons/filter-flagged.png
diff --git a/icons/filter-videos.png b/icons/filter-videos.png
index 8634acd..8634acd 100755..100644
--- a/icons/filter-videos.png
+++ b/icons/filter-videos.png
diff --git a/icons/pin-toolbar.svg b/icons/pin-toolbar.svg
index bdda67a..bdda67a 100755..100644
--- a/icons/pin-toolbar.svg
+++ b/icons/pin-toolbar.svg
diff --git a/icons/rejected.svg b/icons/rejected.svg
index 92e57fe..979b53d 100644
--- a/icons/rejected.svg
+++ b/icons/rejected.svg
@@ -203,8 +203,6 @@
            rdf:resource="http://creativecommons.org/ns#Notice" />
         <cc:requires
            rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:prohibits
-           rdf:resource="http://creativecommons.org/ns#CommercialUse" />
         <cc:permits
            rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
         <cc:requires
diff --git a/icons/shotwell-16.svg b/icons/shotwell-16.svg
deleted file mode 100644
index db38cb2..0000000
--- a/icons/shotwell-16.svg
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-
-<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"
-   version="1.0"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
-   enable-background="new 0 0 180 180"
-   xml:space="preserve"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="shotwell.svg"><metadata
-   id="metadata9"><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><defs
-   id="defs7"><linearGradient
-     id="linearGradient3710"><stop
-       style="stop-color:#c9332e;stop-opacity:1;"
-       offset="0"
-       id="stop3712" /><stop
-       style="stop-color:#87231f;stop-opacity:1;"
-       offset="1"
-       id="stop3714" /></linearGradient><linearGradient
-     id="linearGradient3665"><stop
-       style="stop-color:#667f2e;stop-opacity:1;"
-       offset="0"
-       id="stop3667" /><stop
-       style="stop-color:#94b641;stop-opacity:1;"
-       offset="1"
-       id="stop3669" /></linearGradient><linearGradient
-     id="linearGradient3628"><stop
-       style="stop-color:#099bd1;stop-opacity:1;"
-       offset="0"
-       id="stop3630" /><stop
-       style="stop-color:#035fa9;stop-opacity:1;"
-       offset="1"
-       id="stop3632" /></linearGradient><linearGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient3665"
-     id="linearGradient4937"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(1.025641,0,0,1.0126582,136.85898,-4.28481)"
-     x1="-17.5"
-     y1="22"
-     x2="-17.5"
-     y2="62.152832" /><linearGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient3710"
-     id="linearGradient4939"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(0.16838723,0,0,0.16838725,40.079373,-0.16517623)"
-     x1="-124.5"
-     y1="101.26834"
-     x2="-124.5"
-     y2="73.998131" /><linearGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient3628"
-     id="linearGradient4949"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(1.0761749,0,0,1.0251887,112.74312,3.0132867)"
-     x1="-43.661713"
-     y1="60.388466"
-     x2="-43.661713"
-     y2="31.618958" /></defs><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#e7e7e7"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1024"
-   inkscape:window-height="719"
-   id="namedview5"
-   showgrid="false"
-   inkscape:zoom="16"
-   inkscape:cx="12.787588"
-   inkscape:cy="9.1475636"
-   inkscape:window-x="1024"
-   inkscape:window-y="24"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1"
-   showguides="true"
-   inkscape:guide-bbox="true"
-   inkscape:snap-grids="false"
-   inkscape:showpageshadow="false"
-   showborder="true"><inkscape:grid
-     type="xygrid"
-     id="grid2819"
-     empspacing="5"
-     visible="true"
-     enabled="true"
-     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
-
-<g
-   id="g4920"
-   transform="matrix(0.62380656,0,0,0.62380656,0.55469739,5.4956476)"><rect
-     style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1.6030612;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     id="rect2823"
-     width="12.824489"
-     height="14.427549"
-     x="9.5306835"
-     y="-6.4052672"
-     rx="0"
-     ry="0" /><g
-     transform="matrix(0.10019132,0,0,0.12022958,3.6694907,-6.2249229)"
-     id="g3686"><rect
-       style="fill:url(#linearGradient4937);fill-opacity:1;stroke:none"
-       id="rect3663"
-       width="80"
-       height="80"
-       x="82.5"
-       y="18.5" /></g><rect
-     style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1.60306096;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     id="rect2821"
-     width="11.221428"
-     height="14.427549"
-     x="7.9276218"
-     y="0.0069773095"
-     rx="0"
-     ry="0" /><g
-     transform="matrix(0.59500541,0,0,0.71400649,2.2148058,-6.3674843)"
-     id="g4732"><rect
-       style="fill:url(#linearGradient4939);fill-opacity:1;stroke:none"
-       id="rect3700"
-       width="13.470979"
-       height="13.470979"
-       x="10.948382"
-       y="12.295481" /></g><rect
-     ry="0"
-     rx="0"
-     y="-3.1991448"
-     x="1.5153779"
-     height="16.030609"
-     width="12.824489"
-     id="rect2817"
-     style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1.6030612;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><g
-     transform="matrix(0.07546143,0,0,0.11203951,2.9656204,-4.8213977)"
-     id="g3636"><rect
-       style="fill:url(#linearGradient4949);fill-opacity:1;stroke:none"
-       id="rect3618"
-       width="106.21725"
-       height="100.15598"
-       x="12.646845"
-       y="35.941288" /><path
-       style="fill:#01131a;fill-opacity:1;stroke:none"
-       d="m 12.646845,93.173279 0,42.923991 105.885315,0 0.33193,-57.231989 -106.217245,14.307998 z"
-       id="path4951"
-       sodipodi:nodetypes="ccccc" /></g></g></svg>
\ No newline at end of file
diff --git a/icons/shotwell-24.svg b/icons/shotwell-24.svg
deleted file mode 100644
index 1e6d9ed..0000000
--- a/icons/shotwell-24.svg
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-
-<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"
-   version="1.0"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   enable-background="new 0 0 180 180"
-   xml:space="preserve"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="shotwell.svg"><metadata
-   id="metadata9"><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><defs
-   id="defs7"><linearGradient
-     id="linearGradient3710"><stop
-       style="stop-color:#c9332e;stop-opacity:1;"
-       offset="0"
-       id="stop3712" /><stop
-       style="stop-color:#87231f;stop-opacity:1;"
-       offset="1"
-       id="stop3714" /></linearGradient><linearGradient
-     id="linearGradient3665"><stop
-       style="stop-color:#667f2e;stop-opacity:1;"
-       offset="0"
-       id="stop3667" /><stop
-       style="stop-color:#94b641;stop-opacity:1;"
-       offset="1"
-       id="stop3669" /></linearGradient><linearGradient
-     id="linearGradient3628"><stop
-       style="stop-color:#099bd1;stop-opacity:1;"
-       offset="0"
-       id="stop3630" /><stop
-       style="stop-color:#035fa9;stop-opacity:1;"
-       offset="1"
-       id="stop3632" /></linearGradient><linearGradient
-     id="linearGradient3607"><stop
-       style="stop-color:#fffbf7;stop-opacity:1;"
-       offset="0"
-       id="stop3609" /><stop
-       style="stop-color:#fed697;stop-opacity:1;"
-       offset="1"
-       id="stop3611" /></linearGradient><linearGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient3628"
-     id="linearGradient4849"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(0.94709495,0,0,0.99337445,107.10999,4.0351276)"
-     x1="-43.661713"
-     y1="60.388466"
-     x2="-43.661713"
-     y2="31.618958" /><radialGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient3607"
-     id="radialGradient4851"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(0.82352939,-6.1355775e-8,5.2590677e-8,0.7058825,-29.1752,17.22328)"
-     cx="-165.3261"
-     cy="58.559208"
-     fx="-165.3261"
-     fy="58.559208"
-     r="8.9683418" /><linearGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient3710"
-     id="linearGradient4853"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(0.16838723,0,0,0.16838725,40.079373,-0.16517623)"
-     x1="-124.5"
-     y1="101.26834"
-     x2="-124.5"
-     y2="73.998131" /><linearGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient3665"
-     id="linearGradient4859"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(1.025641,0,0,1.0126582,136.85898,-4.28481)"
-     x1="-17.5"
-     y1="22"
-     x2="-17.5"
-     y2="62.152832" /></defs><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#e7e7e7"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1024"
-   inkscape:window-height="719"
-   id="namedview5"
-   showgrid="false"
-   inkscape:zoom="4"
-   inkscape:cx="14.262976"
-   inkscape:cy="-4.0941656"
-   inkscape:window-x="1024"
-   inkscape:window-y="24"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1"
-   showguides="true"
-   inkscape:guide-bbox="true"
-   inkscape:snap-grids="false"
-   inkscape:showpageshadow="false"><inkscape:grid
-     type="xygrid"
-     id="grid2819"
-     empspacing="5"
-     visible="true"
-     enabled="true"
-     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
-
-<rect
-   ry="0"
-   rx="0"
-   y="1.4999686"
-   x="9.5"
-   height="14.000021"
-   width="12"
-   id="rect2823"
-   style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><g
-   id="g3686"
-   transform="matrix(0.1125,0,0,0.125,1.71875,0.68750003)"><rect
-     y="18.5"
-     x="82.5"
-     height="80"
-     width="80"
-     id="rect3663"
-     style="fill:url(#linearGradient4859);fill-opacity:1;stroke:none" /><path
-     sodipodi:nodetypes="cssssccccccc"
-     id="path3677"
-     d="m 162.5,69.58583 c -2.28236,-1.229642 -4.57791,-5.41744 -7.58117,-4.432837 -0.78685,0.257961 -1.99733,1.357334 -2.75431,0.985074 -1.3901,-0.683607 -3.07858,-2.289088 -4.13145,-3.324628 -0.80496,-0.791701 -4.70948,0.165709 -5.8842,-0.123135 -3.46751,-0.852608 -6.66988,-3.146265 -8.26291,-6.279853 l -2.3787,-3.940301 c -1.72413,-0.890004 -3.25174,-1.970149 -4.56282,-1.970149 l 0,48 10.69739,0 24.85817,0 0,-28.914171 z"
-     style="fill:#6a8430;fill-opacity:1;stroke:none" /><path
-     sodipodi:nodetypes="csscccc"
-     d="m 162.5,82.622687 c -3.33496,-0.219989 -5.59826,-0.201933 -8.62649,0.541512 -2.36305,0.580142 -3.51283,2.267732 -6.28066,2.558951 -3.82935,0.40291 -7.99575,0.09842 -11.75952,0.09842 l 0.13362,12.597917 26.53305,0.08051 0,-15.877312 z"
-     style="fill:#526726;fill-opacity:1;stroke:none"
-     id="path3681" /><path
-     sodipodi:nodetypes="csscccc"
-     d="m 162.5,93.500098 c -2.06783,0.286598 -2.97748,-3.761525 -5.12192,-2.872127 -2.1533,0.893061 -3.76922,2.389161 -6.30492,2.914995 -2.07742,0.4308 -4.65014,-0.342941 -6.35094,-0.128603 l 0,5.085637 17.77778,0 0,-4.999902 z"
-     style="fill:#384619;fill-opacity:1;stroke:none"
-     id="path3679" /></g><rect
-   ry="0"
-   rx="0"
-   y="8.499979"
-   x="6.5"
-   height="14.000021"
-   width="12"
-   id="rect2821"
-   style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><g
-   id="g4732"
-   transform="matrix(0.74233577,0,0,0.74233656,-1.1273759,0.87261515)"><rect
-     y="12.295481"
-     x="10.948382"
-     height="13.470979"
-     width="13.470979"
-     id="rect3700"
-     style="fill:url(#linearGradient4853);fill-opacity:1;stroke:none" /><path
-     sodipodi:nodetypes="cssssssssssssccccc"
-     id="path3698"
-     d="m 22.746535,19.053834 c 0.198966,-0.08701 0.392759,0.08835 0.48121,0.289058 0.01342,0.03047 -0.02041,0.121367 0,0.144532 0.06273,0.07116 0.189322,-0.132434 0.325522,0.176647 0.0858,0.194719 -0.254487,0.546307 -0.169838,0.642354 0.06335,0.07189 0.242053,-0.07864 0.297218,-0.01604 0.04007,0.04546 0.0063,0.308709 0.02831,0.321178 0.134217,0.07614 0.267055,-0.102667 0.325522,0.09635 0.05617,0.191212 -0.350926,0.215354 -0.22645,0.497826 0.02408,0.05462 0.39413,0.11681 0.479802,0.149211 0.01477,0.0056 0.04442,0.146464 0.0361,0.155907 -0.134993,0.153169 -0.176224,0.05489 -0.176224,0.353295 0,0.181733 0.184661,0.0168 0.268854,0.112343 0.0063,0.0071 5.6e-5,0.843438 5.6e-5,0.99572 l -5.6e-5,2.794243 -2.691384,-9e-6 0,-6.712605 1.021362,0 z"
-     style="fill:#4e1413;fill-opacity:1;stroke:none" /></g><rect
-   style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-   id="rect2817"
-   width="14"
-   height="16"
-   x="1.5000001"
-   y="4.5000005"
-   rx="0"
-   ry="0" /><g
-   id="g3636"
-   transform="matrix(0.11767575,0,0,0.12365028,0.76185377,1.5558495)"><rect
-     y="35.941288"
-     x="19.019604"
-     height="97.047897"
-     width="93.477203"
-     id="rect3618"
-     style="fill:url(#linearGradient4849);fill-opacity:1;stroke:none" /><path
-     transform="matrix(1.5101535,0,0,1.4371859,298.43013,-28.000866)"
-     d="m -156.8853,58.559208 c 0,4.661721 -3.77907,8.440792 -8.4408,8.440792 -4.66172,0 -8.44079,-3.779071 -8.44079,-8.440792 0,-4.661721 3.77907,-8.440792 8.44079,-8.440792 4.66173,0 8.4408,3.779071 8.4408,8.440792 z"
-     sodipodi:ry="8.4407921"
-     sodipodi:rx="8.4407921"
-     sodipodi:cy="58.559208"
-     sodipodi:cx="-165.3261"
-     id="path2825"
-     style="fill:url(#radialGradient4851);fill-opacity:1;stroke:none"
-     sodipodi:type="arc" /><path
-     sodipodi:nodetypes="csssssssssssssssssssssssssssssccssssssssccsssssssssssssssssssssccccc"
-     id="path3615"
-     d="m 25.001687,93.889677 c 0.911316,-0.506743 0.850357,-2.3054 2.209168,-1.801683 1.901206,0.704784 1.088581,1.128726 1.693696,1.801682 0.128025,0.142384 1.336983,0.198353 1.546421,0.08189 1.290536,-0.717609 1.428811,-2.440343 2.87192,-1.637895 0.77509,0.430994 0.782776,1.443802 1.251858,1.965473 0.572285,0.636442 1.657056,0.246064 2.135532,1.310315 0.408696,0.90903 -0.316283,2.35079 0.368201,3.112 0.06084,0.0676 1.602176,0.0398 1.620057,0 0.375268,-0.83469 -0.166368,-9.806135 0.147274,-10.154947 0.800902,-0.890693 2.36496,-0.486634 3.092835,-0.08189 0.850814,0.473098 2.39736,-1.5924 4.565622,0.818948 0.187913,0.208978 1.572247,0 1.840977,0 2.29394,0 4.124986,0.08234 6.112039,0.818947 0.135439,0.0502 0.567423,-0.106008 0.662742,0 0.554782,0.61697 -0.350598,2.558302 0.3682,3.357685 0.178561,0.198583 1.550798,0.04177 1.767331,0.08189 1.274699,0.236268 0.417431,-1.119379 0.957307,-1.719789 0.07499,-0.08338 0.612402,0 0.736398,0 0.596573,0 2.916669,-0.277812 3.313754,0.16379 0.05519,0.06139 -0.131734,0.275712 -0.147282,0.327579 -0.163445,0.545304 -0.267603,4.303477 0,4.749887 0.06463,0.10778 1.612418,1.71555 1.62006,1.71979 1.272108,0.70737 1.03375,-4.110354 1.178223,-4.913679 0.582646,-3.239845 -0.710646,-4.838944 2.798283,-5.814525 0.577837,-0.160657 0.867674,-0.900842 1.399142,-0.900842 0.310506,0 0.394248,-4.154349 0.58541,-4.154349 0.346514,0 0.454812,4.15007 0.874734,4.383572 1.811343,1.007207 1.397344,1.228836 1.706328,1.572462 0.109111,0.121336 1.703036,0.348342 2.061895,1.146525 0.48508,1.078928 0.220917,8.378506 0.220917,10.236847 l -0.0026,0.21108 c 0.02755,0.3772 -0.02605,0.75608 -0.02605,1.1292 0,0.50385 1.160028,0.0514 1.275727,-0.46327 0.06964,-0.30967 0.175313,-0.62543 0.208285,-0.95548 0.06366,-0.636731 -0.109767,-3.004971 0.286392,-3.445541 0.03557,-0.0396 0.12197,0.0226 0.156208,0.0289 0.66034,0.1224 1.307281,0.11582 1.978689,0.11582 0.338089,0 2.214979,0.25838 2.473355,-0.0289 0.183793,-0.2044 -0.02402,-1.16889 -0.05212,-1.41875 -0.133739,-1.189857 -0.05202,-2.445035 -0.05202,-3.648226 l -0.260336,-0.579082 c 0.324992,-1.036327 0.0053,-8.518315 0.624853,-9.207424 0.459311,-0.510798 0.677051,-0.492295 0.93727,-0.63699 1.029373,-0.572387 0.781067,-1.039801 0.781067,-2.258426 0,-0.897099 0.546294,-10.133954 0.781052,-10.133954 0.196926,0 0.833127,9.129019 0.833127,10.307681 0,0.252495 0.730508,2.028475 0.833135,2.142606 0.221701,0.246555 0.450224,0.4428 0.624843,0.636995 0.510577,0.567815 -0.195042,7.311171 0.312426,7.875531 0.284632,0.316538 0.695485,0.936855 1.093486,1.158165 0.456115,0.253626 0.853489,-0.249266 1.30176,0 0.641571,0.356746 1.34858,-0.474975 1.770404,0.463267 0.757395,1.684608 -0.104456,4.052877 0.624853,5.675017 0.08548,0.19006 0.363841,0.11581 0.5207,0.11581 2.157185,0 0.390534,-4.9222 1.145542,-6.601544 0.04749,-0.105472 6.386881,-0.07772 6.560931,0.115818 0.926132,1.029976 -0.102111,5.329836 0.416542,5.906646 0.167527,0.18629 1.48443,0 1.77041,0 0.30014,0 1.06443,0.43767 1.24969,0.23164 0.9455,-1.05151 2.25726,-2.203427 2.70767,-3.706138 0.1699,-0.56681 -0.26969,-1.458098 -0.52069,-1.737249 -0.33609,-0.373751 0,-2.963371 0,-3.590318 0,-5.010921 -0.87601,-8.40012 3.33251,-9.960231 l 0,50.843517 -84.979273,0 0,-34.973952 c 0.54743,-0.02803 1.511853,-0.07246 1.733112,-0.08189 z"
-     style="fill:#01131a;fill-opacity:1;stroke:#01131a;stroke-width:8.29008293px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></g></svg>
\ No newline at end of file
diff --git a/icons/shotwell.ico b/icons/shotwell.ico
deleted file mode 100644
index 697fdd7..0000000
--- a/icons/shotwell.ico
+++ /dev/null
diff --git a/icons/shotwell.svg b/icons/shotwell.svg
deleted file mode 100644
index 1a0c067..0000000
--- a/icons/shotwell.svg
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-
-<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"
-   version="1.0"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="120"
-   height="120"
-   viewBox="0 0 120 120"
-   enable-background="new 0 0 180 180"
-   xml:space="preserve"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="shotwell.svg"><metadata
-   id="metadata9"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-   id="defs7"><linearGradient
-     id="linearGradient3710"><stop
-       style="stop-color:#c9332e;stop-opacity:1;"
-       offset="0"
-       id="stop3712" /><stop
-       style="stop-color:#87231f;stop-opacity:1;"
-       offset="1"
-       id="stop3714" /></linearGradient><linearGradient
-     id="linearGradient3665"><stop
-       style="stop-color:#667f2e;stop-opacity:1;"
-       offset="0"
-       id="stop3667" /><stop
-       style="stop-color:#94b641;stop-opacity:1;"
-       offset="1"
-       id="stop3669" /></linearGradient><linearGradient
-     id="linearGradient3628"><stop
-       style="stop-color:#099bd1;stop-opacity:1;"
-       offset="0"
-       id="stop3630" /><stop
-       style="stop-color:#035fa9;stop-opacity:1;"
-       offset="1"
-       id="stop3632" /></linearGradient><linearGradient
-     id="linearGradient3607"><stop
-       style="stop-color:#fffbf7;stop-opacity:1;"
-       offset="0"
-       id="stop3609" /><stop
-       style="stop-color:#fed697;stop-opacity:1;"
-       offset="1"
-       id="stop3611" /></linearGradient><linearGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient3710"
-     id="linearGradient2906"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(0.66249999,0,0,0.66249999,155.6125,-4.0249993)"
-     x1="-124.5"
-     y1="101.26834"
-     x2="-124.5"
-     y2="73.998131" /><linearGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient3628"
-     id="linearGradient2918"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(1.0131827,0,0,1.0031202,113.23728,-0.21917682)"
-     x1="-43.661713"
-     y1="60.388466"
-     x2="-43.661713"
-     y2="31.618958" /><radialGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient3607"
-     id="radialGradient2920"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(0.82352939,-6.1355775e-8,5.2590677e-8,0.7058825,-29.1752,17.22328)"
-     cx="-165.3261"
-     cy="58.559208"
-     fx="-165.3261"
-     fy="58.559208"
-     r="8.9683418" /><linearGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient3665"
-     id="linearGradient2922"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(1.025641,0,0,1.0126582,136.85898,-4.28481)"
-     x1="-17.5"
-     y1="22"
-     x2="-17.5"
-     y2="62.152832" /><filter
-     inkscape:collect="always"
-     id="filter3702"><feGaussianBlur
-       inkscape:collect="always"
-       stdDeviation="1.5975"
-       id="feGaussianBlur3704" /></filter><filter
-     inkscape:collect="always"
-     id="filter3706"><feGaussianBlur
-       inkscape:collect="always"
-       stdDeviation="1.5975"
-       id="feGaussianBlur3708" /></filter><filter
-     inkscape:collect="always"
-     id="filter3710"><feGaussianBlur
-       inkscape:collect="always"
-       stdDeviation="1.5975"
-       id="feGaussianBlur3712" /></filter></defs><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#e7e7e7"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1024"
-   inkscape:window-height="719"
-   id="namedview5"
-   showgrid="false"
-   inkscape:zoom="1"
-   inkscape:cx="36.341145"
-   inkscape:cy="36.952073"
-   inkscape:window-x="1024"
-   inkscape:window-y="24"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1"
-   showguides="true"
-   inkscape:guide-bbox="true"
-   inkscape:snap-grids="false"
-   inkscape:showpageshadow="false"><inkscape:grid
-     type="xygrid"
-     id="grid2819"
-     empspacing="5"
-     visible="true"
-     enabled="true"
-     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
-
-<rect
-   style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.99999981999999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter3702);opacity:0.6"
-   id="rect2924"
-   width="62.000004"
-   height="71"
-   x="50.5"
-   y="5.5"
-   rx="0"
-   ry="0" /><rect
-   style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.99999981999999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter3706);opacity:0.6"
-   id="rect2926"
-   width="65"
-   height="74"
-   x="34.5"
-   y="39.5"
-   rx="0"
-   ry="0" /><rect
-   ry="0"
-   rx="0"
-   y="15.5"
-   x="7.5"
-   height="88"
-   width="78"
-   id="rect2928"
-   style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.99999994000000003;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter3710);opacity:0.6" /><rect
-   ry="0"
-   rx="0"
-   y="5.5"
-   x="50.5"
-   height="71"
-   width="62.000004"
-   id="rect2823"
-   style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:0.99999982;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><g
-   id="g3686"
-   transform="matrix(0.6625,0,0,0.6625,0.34375,-2.25625)"><rect
-     y="18.5"
-     x="82.5"
-     height="80"
-     width="80"
-     id="rect3663"
-     style="fill:url(#linearGradient2922);fill-opacity:1;stroke:none" /><path
-     sodipodi:nodetypes="cssssccccccc"
-     id="path3677"
-     d="m 162.5,69.403979 c -2.22852,-1.237376 -4.46994,-5.451512 -7.40236,-4.460717 -0.76829,0.259584 -1.95022,1.365871 -2.68935,0.99127 -1.35731,-0.687906 -3.00597,-2.303485 -4.03401,-3.345538 -0.78598,-0.79668 -4.59841,0.166751 -5.74542,-0.123909 -3.38574,-0.857971 -6.51258,-3.166053 -8.06803,-6.319349 l -2.32261,-3.965082 c -1.68346,-0.895603 -3.17504,-1.982541 -4.4552,-1.982541 l 0,48.301887 10.4451,0 24.27188,0 0,-29.096021 z"
-     style="fill:#6a8430;fill-opacity:1;stroke:none" /><path
-     sodipodi:nodetypes="csscccc"
-     d="m 162.5,79.027822 c -3.20911,-0.269797 -5.387,-0.247653 -8.30096,0.664119 -2.27389,0.711495 -3.38028,2.781181 -6.04365,3.138337 -3.68484,0.494134 -7.69403,0.120706 -11.31577,0.120706 l 0.12858,15.450277 25.5318,0.09874 0,-19.472178 z"
-     style="fill:#526726;fill-opacity:1;stroke:none"
-     id="path3681" /><path
-     sodipodi:nodetypes="csscccc"
-     d="m 162.5,90.952978 c -2.45799,0.432601 -3.53926,-5.677772 -6.08832,-4.335286 -2.55957,1.348017 -4.48039,3.606282 -7.49452,4.399992 -2.46939,0.650265 -5.52753,-0.517646 -7.54924,-0.194118 l 0,7.676434 21.13208,0 0,-7.547022 z"
-     style="fill:#384619;fill-opacity:1;stroke:none"
-     id="path3679" /></g><rect
-   ry="0"
-   rx="0"
-   y="39.5"
-   x="34.5"
-   height="74"
-   width="65"
-   id="rect2821"
-   style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:0.99999982;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><rect
-   style="fill:url(#linearGradient2906);fill-opacity:1;stroke:none"
-   id="rect3700"
-   width="53"
-   height="53"
-   x="41"
-   y="45" /><path
-   style="fill:#4e1413;fill-opacity:1;stroke:none"
-   d="m 86.549183,74.081477 c 0.886193,-0.310035 1.749359,0.314783 2.143319,1.029989 0.05979,0.10859 -0.09092,0.432448 0,0.514995 0.279367,0.253582 0.843247,-0.471893 1.449895,0.629429 0.38218,0.693827 -1.133497,1.946613 -0.756471,2.288853 0.282161,0.256125 1.078114,-0.280248 1.323818,-0.05721 0.178461,0.161993 0.02823,1.100004 0.126077,1.14443 0.597812,0.271316 1.189475,-0.365825 1.449896,0.343329 0.2502,0.681328 -1.563042,0.767351 -1.008621,1.773859 0.107211,0.194647 1.755465,0.416218 2.137051,0.531672 0.06578,0.01985 0.197844,0.521889 0.160786,0.555535 -0.601263,0.545772 -0.784906,0.195587 -0.784906,1.258864 0,0.647559 0.822487,0.05987 1.197486,0.400301 0.02795,0.02536 2.48e-4,3.005357 2.48e-4,3.547977 L 93.987513,98 82,97.999967 l 0,-23.918486 4.549183,0 z"
-   id="path3698"
-   sodipodi:nodetypes="cssssssssssssccccc" /><rect
-   style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-   id="rect2817"
-   width="78"
-   height="88"
-   x="7.5"
-   y="15.5"
-   rx="0"
-   ry="0" /><g
-   id="g3636"
-   transform="matrix(0.65656596,0,0,0.66151013,0.69694898,0.83443815)"><rect
-     y="32"
-     x="19"
-     height="98"
-     width="100"
-     id="rect3618"
-     style="fill:url(#linearGradient2918);fill-opacity:1;stroke:none" /><path
-     transform="matrix(0.90221167,0,0,0.89546848,202.92837,6.7683671)"
-     d="m -156.8853,58.559208 c 0,4.661721 -3.77907,8.440792 -8.4408,8.440792 -4.66172,0 -8.44079,-3.779071 -8.44079,-8.440792 0,-4.661721 3.77907,-8.440792 8.44079,-8.440792 4.66173,0 8.4408,3.779071 8.4408,8.440792 z"
-     sodipodi:ry="8.4407921"
-     sodipodi:rx="8.4407921"
-     sodipodi:cy="58.559208"
-     sodipodi:cx="-165.3261"
-     id="path2825"
-     style="fill:url(#radialGradient2920);fill-opacity:1;stroke:none"
-     sodipodi:type="arc" /><path
-     sodipodi:nodetypes="csssssssssssssssssssssssssssssccssssssssccsssssssssssssssssssssccccc"
-     id="path3615"
-     d="m 21.519059,93.213403 c 1.061673,-0.524535 0.990657,-2.386339 2.573658,-1.864938 2.214885,0.729528 1.268186,1.168354 1.973138,1.864937 0.149149,0.147381 1.557573,0.205316 1.801566,0.08477 1.503461,-0.742803 1.66455,-2.52602 3.345756,-1.695399 0.902974,0.446126 0.911928,1.494492 1.458404,2.034479 0.666705,0.658786 1.930453,0.254702 2.487873,1.356318 0.476127,0.940945 -0.368466,2.433317 0.428949,3.221258 0.07088,0.06998 1.86652,0.04117 1.887352,0 0.437183,-0.863997 -0.193818,-10.150414 0.171571,-10.511472 0.933044,-0.921965 2.755155,-0.503719 3.603123,-0.08477 0.991189,0.489709 2.7929,-1.648306 5.318904,0.8477 0.218916,0.216316 1.83165,0 2.144719,0 2.672417,0 4.805567,0.08523 7.120463,0.8477 0.157786,0.05197 0.661043,-0.10973 0.772089,0 0.646315,0.638631 -0.408444,2.648119 0.428948,3.475566 0.208023,0.205556 1.806665,0.04323 2.058923,0.08477 1.485011,0.244562 0.486304,-1.158679 1.115253,-1.780169 0.08737,-0.08631 0.713443,0 0.857896,0 0.695002,0 3.39789,-0.287565 3.86049,0.16954 0.0643,0.06355 -0.153469,0.285393 -0.171582,0.33908 -0.190411,0.56445 -0.311756,4.454567 0,4.916656 0.07529,0.111549 1.878451,1.775769 1.887354,1.780168 1.481993,0.732198 1.204308,-4.254669 1.372618,-5.086196 0.678776,-3.353592 -0.827896,-5.008833 3.259972,-6.018664 0.673175,-0.166298 1.010831,-0.93247 1.629986,-0.93247 0.361736,0 0.459296,-4.300201 0.681996,-4.300201 0.403686,0 0.529852,4.295772 1.019056,4.537471 2.110196,1.042569 1.627893,1.271979 1.987856,1.627669 0.12711,0.125596 1.98402,0.360573 2.402087,1.186779 0.565113,1.116807 0.257366,8.672665 0.257366,10.596246 l -0.003,0.218489 c 0.0321,0.39045 -0.03036,0.78263 -0.03036,1.16885 0,0.52154 1.35142,0.0532 1.486209,-0.47953 0.08113,-0.32055 0.204238,-0.64739 0.24265,-0.989033 0.07416,-0.65908 -0.127878,-3.110471 0.333644,-3.566513 0.04144,-0.041 0.142094,0.0234 0.181981,0.02997 0.769289,0.126692 1.52297,0.119882 2.305152,0.119882 0.393871,0 2.580428,0.267459 2.881434,-0.02997 0.214116,-0.211576 -0.02799,-1.209927 -0.06072,-1.468564 -0.155806,-1.23163 -0.06061,-2.530874 -0.06061,-3.776308 l -0.303288,-0.599412 c 0.378611,-1.072711 0.0062,-8.817379 0.727946,-9.530682 0.535093,-0.528731 0.788757,-0.509578 1.091909,-0.659354 1.199211,-0.592482 0.909938,-1.076307 0.909938,-2.337715 0,-0.928595 0.636426,-10.489742 0.909916,-10.489742 0.229418,0 0.970585,9.449524 0.970585,10.669567 0,0.261359 0.851034,2.099693 0.970594,2.21783 0.258279,0.255212 0.524507,0.458346 0.727935,0.659358 0.594817,0.587751 -0.227222,7.567856 0.363974,8.152028 0.331592,0.327653 0.810233,0.969748 1.2739,1.198827 0.531369,0.26253 0.994306,-0.258017 1.516538,0 0.747423,0.369271 1.571082,-0.491649 2.062502,0.479531 0.882358,1.743754 -0.121692,4.195166 0.727947,5.874257 0.09958,0.196736 0.423871,0.119883 0.60661,0.119883 2.513101,0 0.45497,-5.095015 1.334551,-6.833319 0.0553,-0.109174 7.44065,-0.08045 7.64341,0.119883 1.07893,1.066138 -0.11895,5.516963 0.48527,6.114022 0.19517,0.192832 1.72935,0 2.06251,0 0.34967,0 1.24005,0.453039 1.45588,0.239764 1.1015,-1.088415 2.62968,-2.28078 3.15441,-3.836248 0.19793,-0.58671 -0.31419,-1.509289 -0.6066,-1.798242 -0.39154,-0.386872 0,-3.06741 0,-3.716366 0,-5.186847 -1.02054,-8.695037 3.88234,-10.309919 l 0,52.628545 -99,0 0,-36.201827 c 0.637751,-0.02902 1.761294,-0.075 2.019059,-0.08477 z"
-     style="fill:#01131a;fill-opacity:1;stroke:#01131a;stroke-width:1.5173738px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></g></svg>
\ No newline at end of file
diff --git a/icons/slideshow-extension-point.png b/icons/slideshow-extension-point.png
index 5dbd2e0..5dbd2e0 100755..100644
--- a/icons/slideshow-extension-point.png
+++ b/icons/slideshow-extension-point.png