diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2024-02-22 17:32:40 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2024-02-22 17:32:40 +0100 |
commit | 2c3bc9ad65fc70efdd8e981b0bc49346b2ef646f (patch) | |
tree | 0b7ca7dcaaeb737b7e539ce4c3992d18c6949370 /data | |
parent | 5c6c59a0325c2f3cc611b8186ac289d011c14369 (diff) | |
parent | 2bb26608f735b6fc90c06a56793e1cf6e164830a (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'data')
-rw-r--r-- | data/icons/hicolor/scalable/apps/org.gnome.Shotwell.svg | 134 | ||||
-rw-r--r-- | data/icons/meson.build | 1 | ||||
-rw-r--r-- | data/meson.build | 12 | ||||
-rw-r--r-- | data/org.gnome.Shotwell.Auth.desktop.in | 9 | ||||
-rw-r--r-- | data/org.gnome.Shotwell.appdata.xml.in | 9 | ||||
-rw-r--r-- | data/ui/event.ui | 4 | ||||
-rw-r--r-- | data/ui/events_directory.ui | 4 | ||||
-rw-r--r-- | data/ui/import.ui | 4 | ||||
-rw-r--r-- | data/ui/import_queue.ui | 4 | ||||
-rw-r--r-- | data/ui/media.ui | 4 | ||||
-rw-r--r-- | data/ui/offline.ui | 4 | ||||
-rw-r--r-- | data/ui/photo.ui | 4 | ||||
-rw-r--r-- | data/ui/static_message_pane_widget.ui | 3 | ||||
-rw-r--r-- | data/ui/tags.ui | 4 | ||||
-rw-r--r-- | data/ui/trash.ui | 4 |
15 files changed, 113 insertions, 91 deletions
diff --git a/data/icons/hicolor/scalable/apps/org.gnome.Shotwell.svg b/data/icons/hicolor/scalable/apps/org.gnome.Shotwell.svg index d3ede48..cd28713 100644 --- a/data/icons/hicolor/scalable/apps/org.gnome.Shotwell.svg +++ b/data/icons/hicolor/scalable/apps/org.gnome.Shotwell.svg @@ -2,27 +2,31 @@ <!-- 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="180" - height="163.29721" - viewBox="0 0 47.624999 43.205722" + width="130" + height="130" + viewBox="0 0 34.395832 34.395835" version="1.1" id="svg1962" - inkscape:version="0.92.1 r15371" - sodipodi:docname="shotwell.svg"> + inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)" + sodipodi:docname="org.gnome.Shotwell.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs id="defs1956"> <filter inkscape:collect="always" id="filter5562-3" - style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB" + x="-0.021444178" + y="-0.019956649" + width="1.0428884" + height="1.0399133"> <feGaussianBlur inkscape:collect="always" stdDeviation="1.3642241" @@ -32,8 +36,8 @@ inkscape:collect="always" id="filter5574-7" x="-0.14485998" - width="1.2897201" - y="-0.13481142" + width="1.28972" + y="-0.13481141" height="1.2696228" style="color-interpolation-filters:sRGB"> <feGaussianBlur @@ -45,8 +49,8 @@ inkscape:collect="always" id="filter5574" x="-0.14485998" - width="1.2897201" - y="-0.13481142" + width="1.28972" + y="-0.13481141" height="1.2696228"> <feGaussianBlur inkscape:collect="always" @@ -55,7 +59,11 @@ </filter> <filter inkscape:collect="always" - id="filter5562"> + id="filter5562" + x="-0.021444178" + y="-0.019956649" + width="1.0428884" + height="1.0399133"> <feGaussianBlur inkscape:collect="always" stdDeviation="1.3642241" @@ -119,7 +127,7 @@ d="M 155.5293,128.78906 41.039062,161.09961 78.347656,293.53516 C 116.71585,282.70697 156.24425,274.21964 193.12695,259.04102 178.2475,216.64081 168.77837,171.70581 155.5293,128.78906 Z" inkscape:href="#path652-6" id="path4750" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:1.10601008;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:1.10601;stroke-opacity:1;marker:none;enable-background:accumulate" xlink:href="#path652-6" inkscape:original="M 155.5293 128.78906 L 41.039062 161.09961 L 78.347656 293.53516 C 116.71585 282.70697 156.24425 274.21964 193.12695 259.04102 C 178.2475 216.64081 168.77837 171.70581 155.5293 128.78906 z " inkscape:radius="0" @@ -127,7 +135,11 @@ </clipPath> <filter inkscape:collect="always" - id="filter4764"> + id="filter4764" + x="-0.010587096" + y="-0.0097595225" + width="1.0212346" + height="1.0195345"> <feGaussianBlur inkscape:collect="always" stdDeviation="0.47475" @@ -170,7 +182,11 @@ </filter> <filter inkscape:collect="always" - id="filter5739"> + id="filter5739" + x="-0.014127038" + y="-0.013145162" + width="1.0282541" + height="1.0262903"> <feGaussianBlur inkscape:collect="always" stdDeviation="0.8985523" @@ -236,9 +252,9 @@ </clipPath> <filter height="1.6053097" - y="-0.30265486" + y="-0.30265487" width="1.6053097" - x="-0.30265486" + x="-0.30265487" id="filter4709-1-0" inkscape:collect="always" style="color-interpolation-filters:sRGB"> @@ -250,7 +266,11 @@ <filter id="filter4608-6-0" inkscape:collect="always" - style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB" + x="-0.072000001" + y="-0.072000001" + width="1.144" + height="1.144"> <feGaussianBlur id="feGaussianBlur4610-1-5" stdDeviation="0.84057318" @@ -258,9 +278,9 @@ </filter> <filter height="1.405442" - y="-0.20272098" - width="1.222294" - x="-0.11114702" + y="-0.20272099" + width="1.2223002" + x="-0.11115009" id="filter4616-8-2" inkscape:collect="always" style="color-interpolation-filters:sRGB"> @@ -325,7 +345,11 @@ <filter id="filter4412-3-4" inkscape:collect="always" - style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB" + x="-0.022051233" + y="-0.025849292" + width="1.0441025" + height="1.0516986"> <feGaussianBlur id="feGaussianBlur4414-08-9" stdDeviation="0.5940625" @@ -362,8 +386,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.7751634" - inkscape:cx="184.28571" - inkscape:cy="55.913857" + inkscape:cx="147.59205" + inkscape:cy="23.37813" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" @@ -371,12 +395,15 @@ fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - inkscape:window-width="1280" - inkscape:window-height="736" + inkscape:window-width="1920" + inkscape:window-height="1011" inkscape:window-x="0" - inkscape:window-y="27" + inkscape:window-y="0" inkscape:window-maximized="1" - units="px" /> + units="px" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" /> <metadata id="metadata1959"> <rdf:RDF> @@ -385,7 +412,6 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -393,11 +419,11 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-1.0266635,-0.6141706)"> + transform="translate(-10.666607,-9.2951533)"> <g style="display:inline;enable-background:new" id="g27007" - transform="matrix(0.15365393,0,0,0.15365393,7.2037232,2.7005331)"> + transform="matrix(0.15365393,0,0,0.15365393,7.1083329,4.3353011)"> <g id="g3938"> <g @@ -409,9 +435,9 @@ inkscape:connector-curvature="0" id="path5641" d="m 155.53125,130.16376 -114.5,32.3125 L 78,294.22626 178.90625,265.75751 c 6.3543,-1.46637 14.8069,-5.30604 14.8069,-5.30604 l -5.40065,-13.50646 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1535088;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601008;marker:none;filter:url(#filter5562-3);enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.153509;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601;marker:none;filter:url(#filter5562-3);enable-background:accumulate" /> <path - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.28508774;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601008;marker:none;filter:url(#filter5574-7);enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.285088;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601;marker:none;filter:url(#filter5574-7);enable-background:accumulate" d="m 155.53125,130.16376 -114.5,32.3125 L 78,294.22626 178.90625,265.75751 c 6.3543,-1.46637 14.8069,-5.30604 14.8069,-5.30604 l -5.40065,-13.50646 z" id="path5639" inkscape:connector-curvature="0" @@ -435,9 +461,9 @@ inkscape:connector-curvature="0" id="path5568" d="m 155.53125,130.16376 -114.5,32.3125 L 78,294.22626 178.90625,265.75751 c 6.3543,-1.46637 14.8069,-5.30604 14.8069,-5.30604 l -5.40065,-13.50646 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.43421056;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601008;marker:none;filter:url(#filter5574);enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.434211;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601;marker:none;filter:url(#filter5574);enable-background:accumulate" /> <path - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.53070176;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601008;marker:none;filter:url(#filter5562);enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.530702;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601;marker:none;filter:url(#filter5562);enable-background:accumulate" d="m 155.53125,130.16376 -114.5,32.3125 L 78,294.22626 178.90625,265.75751 c 6.3543,-1.46637 14.8069,-5.30604 14.8069,-5.30604 l -5.40065,-13.50646 z" id="path5558" inkscape:connector-curvature="0" @@ -447,7 +473,7 @@ sodipodi:nodetypes="ccccc" clip-path="none" mask="none" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5617);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601008;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5617);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601;marker:none;enable-background:accumulate" d="m 193.12735,259.04147 c -36.8827,15.17862 -76.41062,23.66583 -114.778811,34.49402 L 41.039341,161.09919 155.52978,128.78824 c 13.24907,42.91675 22.71812,87.85302 37.59757,130.25323 z" id="path652-6" inkscape:connector-curvature="0" /> @@ -455,7 +481,7 @@ sodipodi:nodetypes="ccccc" clip-path="none" mask="none" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5619);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.62650001;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5619);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.6265;marker:none;enable-background:accumulate" d="M 177.89611,230.92829 74.980588,259.97585 47.965623,164.76109 150.89304,135.71089 Z" id="path656-5" inkscape:connector-curvature="0" /> @@ -464,7 +490,7 @@ d="M 155.5293,128.78906 41.039062,161.09961 78.347656,293.53516 C 116.71585,282.70697 156.24425,274.21964 193.12695,259.04102 178.2475,216.64081 168.77837,171.70581 155.5293,128.78906 Z" inkscape:href="#path652-6" id="path4742" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.22807019;fill:none;stroke:#000000;stroke-width:0.76326501;stroke-opacity:1;marker:none;filter:url(#filter4764);enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.22807;fill:none;stroke:#000000;stroke-width:0.763265;stroke-opacity:1;marker:none;filter:url(#filter4764);enable-background:accumulate" xlink:href="#path652-6" inkscape:original="M 155.5293 128.78906 L 41.039062 161.09961 L 78.347656 293.53516 C 116.71585 282.70697 156.24425 274.21964 193.12695 259.04102 C 178.2475 216.64081 168.77837 171.70581 155.5293 128.78906 z " inkscape:radius="0" @@ -474,10 +500,10 @@ inkscape:connector-curvature="0" id="path5519" d="m 63.381265,221.33742 0.631168,-0.67134 0.99513,-4.18247 2.703526,2.63649 3.087659,-1.12747 -0.09797,-2.89517 3.153832,2.5076 4.374969,-0.0344 2.093389,4.75996 2.669151,-1.73848 -3.898035,-11.06418 18.526808,-5.05988 2.12604,5.72502 4.503018,-1.28904 -0.83788,-2.92697 3.21658,-0.67716 1.61129,5.62877 7.72128,1.44371 -4.15412,-8.55486 4.2435,-5.59957 -0.8396,-6.33687 2.35119,5.66057 7.3999,2.02291 2.57979,12.41595 c 0,0 3.82842,0.60928 2.99141,-0.61273 -0.83701,-1.222 -3.05931,-6.43226 -3.05931,-6.43226 l 5.98283,-1.22544 -4.67318,-17.1759 3.24835,-1.41708 -3.3214,-15.85766 5.41221,15.50274 3.28188,1.25294 1.67746,9.26383 6.59382,-1.64394 1.74105,7.78402 3.37727,-0.96677 c 0,0 -4.79692,-7.39645 -3.44602,-7.78316 1.35091,-0.38672 6.36867,-1.5795 6.36867,-1.5795 l 2.48096,7.81582 7.81583,-2.48096 -1.38786,-9.10314 -4.79864,-10.80637 3.37553,-4.37669 16.69298,58.31402 -103.190188,29.61014 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#5d1616;fill-opacity:1;stroke:none;stroke-width:2.7650249;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#5d1616;fill-opacity:1;stroke:none;stroke-width:2.76502;marker:none;enable-background:accumulate" /> <path d="m 120.75,120.5 -12.5,40.75 c 0,0 19.5,13.75 28.75,15.25 9.25,1.5 14.25,1.5 14.25,1.5 L 134,116.75 Z m -55.5,15 36.75,23 14.75,-37.25 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.26315792;fill:url(#radialGradient5621);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.263158;fill:url(#radialGradient5621);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" transform="matrix(1.3825125,0,0,1.3825125,-30.205823,-31.335013)" id="path5580" inkscape:connector-curvature="0" /> @@ -487,7 +513,7 @@ inkscape:connector-curvature="0" id="path5591" d="m 63,173.5 16.5,58 60,-16 C 110.34106,211.86701 84.170728,199.76627 63,173.5 Z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.26315792;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;filter:url(#filter5597);enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.263158;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;filter:url(#filter5597);enable-background:accumulate" /> </g> <path style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" @@ -510,7 +536,7 @@ inkscape:radius="0" inkscape:original="M 155.5293 128.78906 L 41.039062 161.09961 L 78.001953 292.84375 L 193.69141 261.14258 L 155.5293 128.78906 z " xlink:href="#path5643" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.49561409;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601008;marker:none;filter:url(#filter5739);enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.495614;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601;marker:none;filter:url(#filter5739);enable-background:accumulate" id="path5735" inkscape:href="#path5643" d="M 155.5293,128.78906 41.039062,161.09961 78.001953,292.84375 193.69141,261.14258 Z" @@ -519,12 +545,12 @@ inkscape:connector-curvature="0" id="path5643" d="M 193.69137,261.1424 78.002911,292.84423 41.039341,161.09919 155.52978,128.78824 Z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5737);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601008;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5737);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601;marker:none;enable-background:accumulate" mask="none" clip-path="none" sodipodi:nodetypes="ccccc" /> <path - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.26315792;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;filter:url(#filter5597);enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.263158;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;filter:url(#filter5597);enable-background:accumulate" d="m 63,173.5 16.5,58 60,-16 C 110.34106,211.86701 84.170728,199.76627 63,173.5 Z" id="path5653" inkscape:connector-curvature="0" @@ -594,12 +620,12 @@ id="path6038" /> <path inkscape:connector-curvature="0" - style="display:inline;opacity:0.79729698;fill:url(#linearGradient81642-3);fill-opacity:1;fill-rule:evenodd;stroke:none" + style="display:inline;opacity:0.797297;fill:url(#linearGradient81642-3);fill-opacity:1;fill-rule:evenodd;stroke:none" d="m -137.01768,149.60114 c -1.08931,0.0664 -2.17479,0.22535 -2.81104,0.86407 0.0252,0.82315 0.63823,1.7851 1.13122,2.67862 0.99606,1.6456 2.00399,3.28029 3.01673,4.9252 h 5.45074 c -0.46863,-1.05859 -0.90183,-2.14303 -1.33702,-3.19706 -0.51043,-1.17486 -0.89865,-2.34004 -1.30267,-3.49942 -0.0461,-0.43328 -0.5813,-0.80877 -1.02843,-0.99375 -1.09118,-0.52743 -2.15549,-0.7507 -3.11953,-0.77766 z" id="path6040" /> <path inkscape:connector-curvature="0" - style="display:inline;opacity:0.49153197;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter4412-3-4)" + style="display:inline;opacity:0.491532;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter4412-3-4)" d="m 80.40625,432.78125 c 4.95211,3.15625 10.09773,2.36004 13.8125,6.28125 0.16682,0.1761 0.33306,0.33512 0.5,0.5 0.47081,0.0642 0.86634,0.12875 1.125,0.125 -0.20957,-0.21165 -0.41647,-0.40488 -0.625,-0.625 -3.01825,-3.18598 -6.9951,-3.26716 -11.03125,-4.875 -0.03474,-0.0138 -0.059,-0.0484 -0.09375,-0.0625 -1.10179,-0.36006 -2.29362,-0.75403 -3.6875,-1.34375 z m 18.125,0.625 c -0.63373,2.51321 2.51245,5.71105 1.53125,6.78125 -0.28982,0.31612 -0.95433,0.69532 -1.40625,1.125 0.12002,0.10757 0.25465,0.20603 0.375,0.3125 0.45504,-0.64981 1.60175,-0.96015 1.75,-1.34375 0.0395,-0.1023 0.21224,-0.3176 0.46875,-0.59375 0.007,-0.15893 -0.013,-0.33834 -0.0625,-0.53125 -0.36749,0.24581 -0.65336,0.32478 -0.6875,0.15625 -0.13053,-0.6444 -2.23183,-4.07697 -1.96875,-5.90625 z m 15.125,3 c -3.23258,3.13778 -1.93744,10.59758 -4.28125,11.3125 -0.87305,0.26631 -2.67739,0.13373 -3.71875,0.65625 0.10564,0.23081 0.1924,0.46561 0.28125,0.71875 0.48934,-1.38565 3.28817,-1.02442 4.4375,-1.375 0.40212,-0.12266 0.70836,-0.4424 0.9375,-0.90625 -0.37324,0.16279 -0.58924,0.18863 -0.5,-0.0313 0.43039,-1.06043 0.76035,-7.91801 2.84375,-10.375 z m -9.875,0.1875 c -0.65633,0.8653 -1.67467,1.86478 -2.40625,2.40625 0.035,0.0884 0.11425,0.25945 0.125,0.3125 0.006,0.0315 0.01,0.0483 0.0313,0.0625 0.76016,-0.80336 1.86771,-1.92287 2.25,-2.78125 z m 31.15625,1.28125 c -0.10681,2.33068 2.61199,5.60659 1.375,8.5 0.1879,0.0583 0.37002,0.14826 0.5625,0.21875 1.03088,-2.07763 -1.84715,-6.99222 -1.9375,-8.71875 z m -44.09375,1.4375 c -0.58853,-0.002 -1.19981,0.0498 -1.8125,0.15625 -0.24454,0.0425 -0.47494,0.0811 -0.71875,0.0937 0.57324,0.0163 1.14758,0.006 1.71875,-0.0937 0.3802,-0.0661 0.75059,-0.10454 1.125,-0.125 -0.10937,-0.003 -0.20125,-0.031 -0.3125,-0.0313 z m -4.90625,0.21875 c -1.05294,0.0153 -2.13802,0.17596 -3.34375,0.96875 0.73581,-0.30835 1.4245,-0.46615 2.09375,-0.5625 0.66231,-0.25997 1.29099,-0.37458 1.90625,-0.40625 -0.21749,-0.006 -0.43522,-0.003 -0.65625,0 z M 91.625,439.75 c -0.16769,-0.002 -0.31622,0.0195 -0.46875,0.0313 1.75151,0.14017 4.01985,0.84237 5.59375,1.75 3.19912,2.92004 6.06811,5.00342 6.65625,7.03125 0.69343,2.39084 0.87982,8.89902 0.9375,12.375 0.0202,0.021 0.0422,0.0415 0.0625,0.0625 0.30813,0.3105 0.62898,0.60098 0.96875,0.875 -0.0381,-3.13547 -0.21719,-10.72125 -0.96875,-13.3125 -0.58814,-2.02783 -3.45713,-4.11121 -6.65625,-7.03125 -1.7362,-1.00123 -4.32697,-1.76239 -6.125,-1.78125 z m -4.5,0.0625 c 0.65921,0.0186 1.30134,0.0547 1.9375,0.0313 -0.6308,-0.0149 -1.27239,-0.0416 -1.9375,-0.0313 z m 38.90625,0.59375 c 0.85981,2.03517 1.03075,4.21454 1.875,5.96875 0.0201,0.0419 0.0431,0.0827 0.0625,0.125 -0.0386,0.0749 -0.0625,0.16002 -0.0625,0.25 0,0.22641 0.14749,0.41694 0.34375,0.5 0.75795,2.22902 0.68188,4.89913 0.75,7.1875 0.35884,0.43277 0.71896,0.90498 1.0625,1.46875 -0.081,-0.88874 -0.10567,-1.89754 -0.125,-2.9375 -0.22118,-1.90879 -0.22993,-4.24515 -1.0625,-5.875 0.0353,-0.0409 0.0733,-0.0777 0.0937,-0.125 -0.004,-0.008 0.004,-0.0227 0,-0.0313 -0.0255,-0.0612 -0.0625,-0.11723 -0.0625,-0.1875 0,-0.09 0.024,-0.17511 0.0625,-0.25 -0.0194,-0.0423 -0.0424,-0.0831 -0.0625,-0.125 -0.0198,-0.0411 -0.0434,-0.0834 -0.0625,-0.125 -0.0287,0.006 -0.0655,0.0249 -0.0937,0.0313 -0.0628,-0.0425 -0.14103,-0.0804 -0.21875,-0.0937 -1.38487,-2.04113 -0.95284,-3.54566 -2.5,-5.78125 z m 19.03125,2.65625 c -1.69758,2.49457 -3.86818,2.37373 -5.125,4.8125 0.0526,0.0186 0.10315,0.0444 0.15625,0.0625 0.89869,-2.16469 3.75785,-2.67569 4.96875,-4.875 z m -27.6875,1.3125 c -2.19466,0.39587 -4.28042,1.54971 -5.5,2.15625 -0.0203,0.0759 -0.0419,0.19937 -0.0625,0.25 -0.0928,0.22874 0.15792,0.18098 0.5625,0 1.35368,-0.92023 3.20812,-2.03073 5,-2.40625 z m 4.90625,1.28125 c 1.34906,7.76942 7.42824,8.46368 5.875,13.34375 -1.18921,1.23925 -3.11722,3.33597 -4.03125,4.25 -0.76285,0.67868 -1.59581,1.26835 -2.4375,1.84375 -0.87643,0.65389 -0.79689,1.13319 -1.71875,1.71875 -0.68733,0.46263 -2.24808,0.96188 -2.84375,1.4375 -0.77914,0.62211 -1.21036,1.46972 -1.875,2.3125 -0.17709,0.23959 -0.47526,0.38932 -0.78125,0.5625 0.0747,0.23312 0.17111,0.49452 0.21875,0.6875 0.32292,-0.63542 1.20833,-0.77083 1.5625,-1.25 0.66464,-0.84278 1.09586,-1.69039 1.875,-2.3125 0.59567,-0.47562 2.15642,-0.97487 2.84375,-1.4375 0.92186,-0.58556 0.84232,-1.06486 1.71875,-1.71875 0.84169,-0.5754 1.67465,-1.16507 2.4375,-1.84375 0.91403,-0.91403 2.84204,-3.01075 4.03125,-4.25 0.39409,-1.23817 0.2929,-2.21057 -0.0937,-3.09375 -0.005,-0.008 0.005,-0.0235 0,-0.0313 -2.33668,-3.81627 -5.15947,-3.88386 -6.78125,-10.21875 z m 9.625,0.21875 c -0.92497,0.006 -1.69874,0.11176 -2.40625,0.25 0.0135,0.0204 0.0173,0.042 0.0313,0.0625 0.0777,0.0133 0.1559,0.0513 0.21875,0.0937 0.73442,-0.16654 1.63943,-0.32515 2.6875,-0.375 -0.17873,-0.007 -0.35939,-0.0323 -0.53125,-0.0313 z m 0.78125,0.34375 c -0.0732,0.003 -0.1456,0.0269 -0.21875,0.0313 0.67709,0.016 1.33761,0.0544 1.875,0.15625 1.80941,0.34285 1.14282,0.69721 2.0625,0.75 0.8083,0.0464 2.21338,0.8335 3.34375,1.28125 1.22261,0.48428 1.53834,-0.0211 3.84375,1.21875 -1.65524,-1.12051 -3.34913,-1.13223 -3.59375,-1.40625 0.0129,-0.0419 0.017,-0.0842 0.0313,-0.125 -0.0649,-0.0291 -0.12217,-0.0641 -0.1875,-0.0937 -0.0207,0.0437 -0.0423,0.0797 -0.0625,0.125 -1.00669,-0.2824 -1.9875,-0.7062 -2.65625,-1.0625 -0.18654,-0.0477 -0.28433,-0.1223 -0.40625,-0.21875 -0.0974,-0.077 -0.24506,-0.15717 -0.5,-0.25 -0.0108,0.0211 -0.02,0.0415 -0.0313,0.0625 -0.24588,-0.0977 -0.48007,-0.17228 -0.71875,-0.25 -0.0468,-0.01 -0.0744,-0.0217 -0.125,-0.0313 -0.74419,-0.14102 -1.69938,-0.22641 -2.65625,-0.1875 z M 86.625,448.25 l 0.125,0.0625 c 0.9109,0.24481 1.68179,0.8215 2.40625,1.40625 0.82464,0.41098 1.87022,0.34115 2.53125,1.0625 0.70456,0.74408 1.76065,1.14357 2.28125,2.0625 0.20942,0.35023 0.44974,0.66458 0.71875,0.96875 -0.70331,0.27896 -1.37908,1.26201 -1.875,1.59375 -0.0184,0.0123 -0.0433,0.0207 -0.0625,0.0313 0.26674,0.0829 0.5096,0.12431 0.71875,0.0937 0.35283,-0.4495 0.78212,-0.98745 1.375,-1.09375 0.27247,-0.26266 0.5507,-0.50877 0.84375,-0.625 -0.26901,-0.30417 -0.50933,-0.61852 -0.71875,-0.96875 -0.5206,-0.91893 -1.57669,-1.31842 -2.28125,-2.0625 -0.66103,-0.72135 -1.70661,-0.65152 -2.53125,-1.0625 -0.06827,-0.0551 -0.14958,-0.10156 -0.21875,-0.15625 -0.45456,-0.0788 -0.91165,-0.20596 -1.25,-0.53125 -0.59769,-0.44175 -1.32432,-0.71337 -2.0625,-0.78125 z m 28.3125,3.0625 c -0.5615,-0.002 -1.13254,0.0198 -1.6875,0.1875 -0.8619,0.15181 -1.40092,0.98682 -2.1875,1.125 0.15712,0.0284 0.29573,0.0585 0.46875,0.0625 0.008,-0.004 0.0232,0.004 0.0313,0 0.66399,-0.34171 1.29896,-0.84303 2,-1.0625 0.29196,-0.11393 0.63652,-0.16173 1,-0.1875 0.45253,-0.0986 0.91776,-0.12668 1.375,-0.125 -0.33672,-0.005 -0.66726,10e-4 -1,0 z m -6.28125,1.09375 c -0.11119,0.004 -0.22334,0.008 -0.34375,0.0313 -0.58666,0.0833 -1.09791,0.25436 -1.625,0.40625 0.003,0.0315 -0.003,0.0623 0,0.0937 -0.007,0.11209 0.31024,10e-4 0.40625,0.0625 0.72887,-0.15857 1.36514,-0.40917 2.125,-0.53125 -0.18386,-0.0329 -0.36151,-0.0695 -0.5625,-0.0625 z m 0.75,0.375 c -0.11556,0.005 -0.24955,0.007 -0.375,0.0313 0.5303,0.0941 1.02742,0.28089 1.6875,0.1875 0.0423,-0.008 0.0833,-0.0213 0.125,-0.0313 -0.48738,-0.0785 -0.91748,-0.20805 -1.4375,-0.1875 z m -23.5625,0.1875 c -0.18337,-0.008 -0.35057,0.01 -0.53125,0.0313 2.08544,-0.0469 5.75517,2.50843 6.46875,2.71875 0.55836,0.16459 -1.66639,2.10357 -3.375,3.03125 1.32776,-0.37746 3.38761,-2.02266 4.1875,-2.5 0.01714,-0.0102 0.01528,-0.0221 0.03125,-0.0313 0.21446,-0.26888 0.31472,-0.45329 0.15625,-0.5 -0.0892,-0.0263 -0.23354,-0.0976 -0.40625,-0.1875 -1.40032,0.064 -4.06601,-2.46133 -6.53125,-2.5625 z m 53.78125,0.0625 c -0.88641,0.37401 -1.6291,0.38336 -2.375,0.375 0.46305,-0.0347 0.90399,-0.0303 1.34375,-0.0313 0.31369,-0.0695 0.65846,-0.15916 1.03125,-0.34375 z m -2.375,0.375 c -0.97055,-0.0109 -1.9515,-0.0429 -3.3125,0.75 -0.98526,0.56636 -1.68584,0.93652 -2.3125,1.3125 0.1001,0.15403 0.21261,0.29518 0.34375,0.40625 0.43285,-0.30459 0.95516,-0.58877 1.53125,-0.90625 0.0447,-0.0331 0.0806,-0.0614 0.125,-0.0937 0.66035,-0.48117 1.29197,-0.8658 1.78125,-1.09375 0.34797,-0.16212 0.68254,-0.22024 1,-0.25 0.018,-0.004 0.0446,0.004 0.0625,0 0.27556,-0.0643 0.52793,-0.10604 0.78125,-0.125 z m -41.40625,1.03125 c -0.15346,0.0275 -0.30526,0.0776 -0.4375,0.15625 0.22223,0.23657 0.45596,0.46782 0.65625,0.71875 0.69303,0.78032 1.38577,1.54029 1.96875,2.40625 0.85162,1.06177 1.95474,1.87787 2.875,2.875 0.7471,0.7803 1.39506,1.64575 2.09375,2.46875 0.93323,1.12487 1.87928,2.25013 2.8125,3.375 0.42144,0.87267 1.03174,1.61036 1.65625,2.34375 0.66563,0.75999 1.30957,1.55781 1.8125,2.4375 0.59909,0.89138 1.1135,1.84141 1.5,2.84375 0.30827,0.94828 0.48395,1.92145 0.625,2.90625 0.19051,1.03702 0.34872,2.0991 0.25,3.15625 -0.14578,1.5715 -0.30651,3.14619 -0.4375,4.71875 -0.0217,0.7843 -0.12135,1.62135 0.25,2.34375 0.88575,0.56065 1.94401,0.69175 2.96875,0.75 0.15421,-0.004 0.31552,-0.0153 0.46875,-0.0313 -0.85535,-0.0774 -1.70207,-0.25325 -2.4375,-0.71875 -0.37135,-0.7224 -0.27171,-1.55945 -0.25,-2.34375 0.13099,-1.57256 0.29172,-3.14725 0.4375,-4.71875 0.0987,-1.05715 -0.0595,-2.11923 -0.25,-3.15625 -0.14105,-0.9848 -0.31673,-1.95797 -0.625,-2.90625 -0.3865,-1.00234 -0.90091,-1.95237 -1.5,-2.84375 -0.50293,-0.87969 -1.14687,-1.67751 -1.8125,-2.4375 -0.62451,-0.73339 -1.23481,-1.47108 -1.65625,-2.34375 -0.93322,-1.12487 -1.87927,-2.25013 -2.8125,-3.375 -0.69869,-0.823 -1.34665,-1.68845 -2.09375,-2.46875 -0.92026,-0.99713 -2.02338,-1.81323 -2.875,-2.875 -0.58298,-0.86596 -1.27572,-1.62593 -1.96875,-2.40625 -0.24141,-0.30245 -0.51438,-0.59268 -0.78125,-0.875 -0.15942,-0.0325 -0.29833,-0.0249 -0.4375,0 z M 132.25,460 c -0.27801,0.006 -0.56326,0.0349 -0.84375,0.0625 0.10242,0.002 0.20882,0.017 0.3125,0.0313 0.3359,0.0194 0.69022,-0.0275 1.03125,-0.0625 -0.1656,-0.029 -0.331,-0.0347 -0.5,-0.0313 z m -2.09375,0.0625 c -0.0128,0.019 -0.0184,0.0436 -0.0313,0.0625 0.19686,0.005 0.40053,-0.0167 0.59375,-0.0313 -0.19023,-0.0261 -0.37567,-0.039 -0.5625,-0.0313 z m 2.78125,0.21875 c -0.14219,0.006 -0.2642,0.0468 -0.40625,0.0625 0.65402,0.0921 0.99171,0.6953 1.71875,0.625 0.16682,-0.0309 0.33094,-0.0464 0.5,-0.0625 -0.11167,-0.0407 -0.21151,-0.0958 -0.3125,-0.15625 -0.10595,0.005 -0.20725,0.01 -0.3125,0 -0.40936,-0.035 -0.64885,-0.24056 -0.90625,-0.4375 -0.0927,-0.004 -0.18865,-0.0352 -0.28125,-0.0313 z m 2.28125,0.40625 c -0.072,10e-4 -0.14679,0.0254 -0.21875,0.0313 0.0432,0.009 0.0772,0.0272 0.125,0.0313 0.15833,0.0145 0.30899,-0.0171 0.46875,-0.0313 -0.12245,-0.0226 -0.25224,-0.0334 -0.375,-0.0313 z m 0.96875,0.1875 c -0.0641,0.002 -0.12357,0.0276 -0.1875,0.0313 0.0927,0.006 0.18873,-0.008 0.28125,0 -0.0298,-0.0116 -0.0634,-0.0202 -0.0937,-0.0313 z" id="path6048" clip-path="url(#clipPath4396-4-0)" @@ -614,7 +640,7 @@ <path inkscape:connector-curvature="0" id="path5661" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.26315792;fill:url(#radialGradient5680);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.263158;fill:url(#radialGradient5680);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" d="m 65.721644,159.81043 40.178316,49.03653 c -1.02107,4.80894 -33.127292,39.78516 -33.127292,39.78516 L 47.828886,164.33579 Z m 77.732016,-22.58834 c -0.26874,31.03893 -19.8432,43.99547 -30.87274,64.95546 L 73.075232,158.07018 Z" sodipodi:nodetypes="ccccccccc" /> </g> diff --git a/data/icons/meson.build b/data/icons/meson.build index 1b1006f..2ab5223 100644 --- a/data/icons/meson.build +++ b/data/icons/meson.build @@ -6,4 +6,5 @@ install_subdir('hicolor/24x24', install_dir : icondir) install_subdir('hicolor/32x32', install_dir : icondir) install_subdir('hicolor/48x48', install_dir : icondir) install_subdir('hicolor/256x256', install_dir : icondir) +install_subdir('hicolor/scalable/apps', install_dir: join_paths(icondir, 'scalable')) install_subdir('hicolor/symbolic', install_dir : icondir) diff --git a/data/meson.build b/data/meson.build index 9c17f0f..f04dbcb 100644 --- a/data/meson.build +++ b/data/meson.build @@ -9,7 +9,7 @@ podir = join_paths('..', 'po') i18n.merge_file(input : 'org.gnome.Shotwell.appdata.xml.in', output : 'org.gnome.Shotwell.appdata.xml', - po_dir : join_paths('..', 'po'), + po_dir : podir, type : 'xml', install: true, install_dir : join_paths(get_option('datadir'), 'metainfo')) @@ -28,5 +28,15 @@ i18n.merge_file(input : 'org.gnome.Shotwell-Viewer.desktop.in', install : true, install_dir : join_paths(get_option('datadir'), 'applications')) +auth_conf = configuration_data() +auth_conf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir'))) +configure_file( + input : 'org.gnome.Shotwell.Auth.desktop.in', + output: 'org.gnome.Shotwell.Auth.desktop', + configuration: auth_conf, + install: true, + install_dir : join_paths(get_option('datadir'), 'applications') +) + shotwell_resources = gnome.compile_resources('shotwell-resources', 'org.gnome.Shotwell.gresource.xml') diff --git a/data/org.gnome.Shotwell.Auth.desktop.in b/data/org.gnome.Shotwell.Auth.desktop.in new file mode 100644 index 0000000..55c50ed --- /dev/null +++ b/data/org.gnome.Shotwell.Auth.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Name=Shotwell Authentication helper +Exec=@libexecdir@/shotwell/shotwell-authenticator %u +Icon=org.gnome.Shotwell +Terminal=false +NoDisplay=true +Type=Application +MimeType=x-scheme-handler/shotwell-oauth2;x-scheme-handler/com.googleusercontent.apps.534227538559-hvj2e8bj0vfv2f49r7gvjoq6jibfav67; diff --git a/data/org.gnome.Shotwell.appdata.xml.in b/data/org.gnome.Shotwell.appdata.xml.in index eca7846..19928e1 100644 --- a/data/org.gnome.Shotwell.appdata.xml.in +++ b/data/org.gnome.Shotwell.appdata.xml.in @@ -54,6 +54,15 @@ <url type="bugtracker">https://gitlab.gnome.org/GNOME/shotwell/issues</url> <releases> + <release version="0.32.6" date="2024-02-14" urgency="low" type="stable"> + <description> + <ul> + <li>Fixes missing icons for the viewer</li> + <li>Fixes viewer being always full-screen</li> + <li>OAUTH authentication flow for web sharing is now done with user's browser</li> + </ul> + </description> + </release> <release version="0.32.4" date="2023-12-02" urgency="medium" type="stable"> <description> <ul> diff --git a/data/ui/event.ui b/data/ui/event.ui index 9579f96..083fec9 100644 --- a/data/ui/event.ui +++ b/data/ui/event.ui @@ -10,10 +10,6 @@ <attribute name="action">win.CommonFileImport</attribute> </item> <item> - <attribute name="label" translatable="yes">Import From _Application…</attribute> - <attribute name="action">win.ExternalLibraryImport</attribute> - </item> - <item> <attribute name="label" translatable="yes">_Export…</attribute> <attribute name="accel"><Primary><Shift>e</attribute> <attribute name="action">win.Export</attribute> diff --git a/data/ui/events_directory.ui b/data/ui/events_directory.ui index 6d0e939..32ca7f7 100644 --- a/data/ui/events_directory.ui +++ b/data/ui/events_directory.ui @@ -9,10 +9,6 @@ <attribute name="accel"><Primary>i</attribute> <attribute name="action">win.CommonFileImport</attribute> </item> - <item> - <attribute name="label" translatable="yes">Import From _Application…</attribute> - <attribute name="action">win.ExternalLibraryImport</attribute> - </item> </section> <section> <item> diff --git a/data/ui/import.ui b/data/ui/import.ui index 6f13e31..8ece8c0 100644 --- a/data/ui/import.ui +++ b/data/ui/import.ui @@ -17,10 +17,6 @@ <attribute name="label" translatable="yes">Import _All</attribute> <attribute name="action">win.ImportAll</attribute> </item> - <item> - <attribute name="label" translatable="yes">Import From _Application…</attribute> - <attribute name="action">win.ExternalLibraryImport</attribute> - </item> </section> <section> <item> diff --git a/data/ui/import_queue.ui b/data/ui/import_queue.ui index 1f67fc3..0423863 100644 --- a/data/ui/import_queue.ui +++ b/data/ui/import_queue.ui @@ -15,10 +15,6 @@ <attribute name="accel"><Primary>i</attribute> <attribute name="action">win.CommonFileImport</attribute> </item> - <item> - <attribute name="label" translatable="yes">Import From _Application…</attribute> - <attribute name="action">win.ExternalLibraryImport</attribute> - </item> </section> <section> <item> diff --git a/data/ui/media.ui b/data/ui/media.ui index 22a6b83..6b45cb3 100644 --- a/data/ui/media.ui +++ b/data/ui/media.ui @@ -10,10 +10,6 @@ <attribute name="action">win.CommonFileImport</attribute> </item> <item> - <attribute name="label" translatable="yes">Import From _Application…</attribute> - <attribute name="action">win.ExternalLibraryImport</attribute> - </item> - <item> <attribute name="label" translatable="yes">_Export…</attribute> <attribute name="accel"><Primary><Shift>e</attribute> <attribute name="action">win.Export</attribute> diff --git a/data/ui/offline.ui b/data/ui/offline.ui index 3daefca..f8ad6b0 100644 --- a/data/ui/offline.ui +++ b/data/ui/offline.ui @@ -9,10 +9,6 @@ <attribute name="accel"><Primary>i</attribute> <attribute name="action">win.CommonFileImport</attribute> </item> - <item> - <attribute name="label" translatable="yes">Import From _Application…</attribute> - <attribute name="action">win.ExternalLibraryImport</attribute> - </item> </section> <section> <item> diff --git a/data/ui/photo.ui b/data/ui/photo.ui index 3b93546..62cf091 100644 --- a/data/ui/photo.ui +++ b/data/ui/photo.ui @@ -10,10 +10,6 @@ <attribute name="action">win.CommonFileImport</attribute> </item> <item> - <attribute name="label" translatable="yes">Import From _Application…</attribute> - <attribute name="action">win.ExternalLibraryImport</attribute> - </item> - <item> <attribute name="label" translatable="yes">_Export…</attribute> <attribute name="accel"><Primary><Shift>e</attribute> <attribute name="action">win.Export</attribute> diff --git a/data/ui/static_message_pane_widget.ui b/data/ui/static_message_pane_widget.ui index 8b57f3d..7c38ebf 100644 --- a/data/ui/static_message_pane_widget.ui +++ b/data/ui/static_message_pane_widget.ui @@ -18,6 +18,9 @@ changes made here will not display.</property> <property name="wrap">True</property> <property name="max-width-chars">70</property> + <style> + <class name="heading"/> + </style> </object> <packing> <property name="expand">False</property> diff --git a/data/ui/tags.ui b/data/ui/tags.ui index 03378ae..a8dcd1a 100644 --- a/data/ui/tags.ui +++ b/data/ui/tags.ui @@ -10,10 +10,6 @@ <attribute name="action">win.CommonFileImport</attribute> </item> <item> - <attribute name="label" translatable="yes">Import From _Application…</attribute> - <attribute name="action">win.ExternalLibraryImport</attribute> - </item> - <item> <attribute name="label" translatable="yes">_Export…</attribute> <attribute name="accel"><Primary><Shift>e</attribute> <attribute name="action">win.Export</attribute> diff --git a/data/ui/trash.ui b/data/ui/trash.ui index 1dc188d..7500968 100644 --- a/data/ui/trash.ui +++ b/data/ui/trash.ui @@ -9,10 +9,6 @@ <attribute name="accel"><Primary>i</attribute> <attribute name="action">win.CommonFileImport</attribute> </item> - <item> - <attribute name="label" translatable="yes">Import From _Application…</attribute> - <attribute name="action">win.ExternalLibraryImport</attribute> - </item> </section> <section> <item> |