diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2024-03-24 09:24:40 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2024-03-24 09:24:40 +0100 |
| commit | 734fc45fc296a4b6cfa303329023c24e026f35df (patch) | |
| tree | 30038fff46b2fdf3fde9f20a538993cf2ed23fc8 | |
| parent | 14bc7db2e07c5d1ccfb4d723c9dba395e6c93171 (diff) | |
| parent | dde66becd94817998e320c7ace72729af7455345 (diff) | |
Merge branch 'release/debian/0.36.6-1'HEADdebian/0.36.6-1master
45 files changed, 1984 insertions, 3377 deletions
@@ -1,3 +1,31 @@ +Shotwell 0.32.6 (stable) - 14 Feb 2024 + * Fix everything gone wrong with .5 -.- + +Shotwell 0.32.5 (stable) - 14 Feb 2024 + * Fix missing scalable application icon + * Fix missing icon of viewer application in overview + * Fix always maximizing the viewer window + * Remove internal web view for OAUTH flow + * Remove "Import from Application" menu item + +Bugs fixed in this release: + - https://gitlab.gnome.org/GNOME/shotwell/issues/5044 + - https://gitlab.gnome.org/GNOME/shotwell/issues/5051 + - https://gitlab.gnome.org/GNOME/shotwell/issues/5088 + +All contributors to this release: + - Jens Georg <mail@jensge.org> + - Aurimas Černius <aurisc4@gmail.com> + - Martin <miles@filmsi.net> + - Jürgen Benvenuti <jbenvenuti@gnome.org> + - Sergej A. <asvmail.as@gmail.com> + +Added/updated translations: + - ru.po, courtesy of Ser82-png + - de.po, courtesy of Jürgen Benvenuti + - lt.po, courtesy of Aurimas Černius + - sl.po, courtesy of Martin Srebotnjak + Shotwell 0.32.4 (stable) - 02 Dec 2023 * Fix left/right navigation in slideshow * Fix slideshow not starting if video is the first selected item 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> diff --git a/debian/changelog b/debian/changelog index 7ae9bc3..d025250 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +shotwell (0.32.6-1) unstable; urgency=medium + + * New upstream release (Closes: #1064455). + - debian/shotwell.install: + + Install new shotwell-authenticator. + * debian/copyright: + - Add year 2024 to myself. + - Refresh for the new release. + * debian/control: + - Add Build Depend python3-distutils. + + -- Jörg Frings-Fürst <debian@jff.email> Tue, 05 Mar 2024 12:33:07 +0100 + shotwell (0.32.4-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index e0e4606..6716191 100644 --- a/debian/control +++ b/debian/control @@ -31,6 +31,7 @@ Build-Depends: libwebkit2gtk-4.1-dev, libwebp-dev, libxml2, + python3-distutils, meson, ninja-build, valac diff --git a/debian/copyright b/debian/copyright index 7b7391c..0e00f42 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,7 +9,19 @@ Copyright: 2009-2013 Yorba Foundation 2010 Maxim Kartashev 2013 Jens Bav 2016-2019 Software Freedom Conservancy Inc. - 2011-2023 the shotwell authors + 2011-2024 the shotwell authors +License: LGPL-2.1 + +Files: subprojects/shotwell-facedetect/*.xml +Copyright: 2000 Intel Corporation +License: BSD-3-Clause + +Files: subprojects/shotwell-facedetect/*.cpp + subprojects/shotwell-facedetect/*.hpp +Copyright: 2016 Software Freedom Conservancy Inc. + 2011 Valentín Barros Puertas <valentin(at)sanva(dot)net> + 2018 Ricardo Fantin da Costa <ricardofantin(at)gmail(dot)com> + 2018 Narendra A <narendra_m_a(at)yahoo(dot)com> License: LGPL-2.1 Files: plugins/shotwell-publishing/PhotosPublisher.vala @@ -22,7 +34,7 @@ License: LGPL-2.1 Files: debian/* Copyright: 2009-2011 Devid Antonio Filoni <d.filoni@ubuntu.com> - 2014-2023 Jörg Frings-Fürst <debian@jff.email> + 2014-2024 Jörg Frings-Fürst <debian@jff.email> License: GPL-2+ License: LGPL-2.1 @@ -60,3 +72,39 @@ License: GPL-2+ . On Debian systems, the complete text of the GNU General Public License can be found in the file `/usr/share/common-licenses/GPL-2'. + +License: BSD-3-clause + Redistribution and use in source and binary forms, + with or without modification, + are permitted provided that the following conditions are met: + 1. Redistributions of source code must retain + the above copyright notice, this list of conditions + and the following disclaimer. + 2. Redistributions in binary form must reproduce + the above copyright notice, this list of conditions + and the following disclaimer + in the documentation + and/or other materials provided with the distribution. + 3. Neither the name of the Creytiv.com + nor the names of its contributors + may be used to endorse or promote products + derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, + THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; + OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..3a3ffb3 --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +shotwell_0.32.6-1_source.buildinfo gnome optional diff --git a/debian/shotwell.install b/debian/shotwell.install index 75588ce..356bdcb 100644 --- a/debian/shotwell.install +++ b/debian/shotwell.install @@ -5,4 +5,5 @@ usr/share/metainfo usr/libexec/shotwell/shotwell-settings-migrator usr/libexec/shotwell/shotwell-video-thumbnailer usr/libexec/shotwell/shotwell-video-metadata-handler +usr/libexec/shotwell/shotwell-authenticator usr/share/apport/package-hooks/shotwell.py diff --git a/flatpak/org.gnome.Shotwell.json b/flatpak/org.gnome.Shotwell.json index 13f40d6..5ad2e6c 100644 --- a/flatpak/org.gnome.Shotwell.json +++ b/flatpak/org.gnome.Shotwell.json @@ -256,7 +256,7 @@ "name" : "shotwell", "buildsystem" : "meson", "config-opts" : [ - "-Dfatal_warnings=true", + "-Dfatal_warnings=false", "-Dudev=false", "-Dinstall_apport_hook=false", "-Dface_detection_helper_bus=private", diff --git a/help/ru/ru.po b/help/ru/ru.po index a3dee78..ed73f6d 100644 --- a/help/ru/ru.po +++ b/help/ru/ru.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: shotwell master\n" -"POT-Creation-Date: 2023-04-05 20:04+0000\n" -"PO-Revision-Date: 2023-04-06 23:14+1000\n" +"POT-Creation-Date: 2023-11-25 19:35+0000\n" +"PO-Revision-Date: 2023-12-09 20:58+1000\n" "Last-Translator: Ser82-png <asvmail.as@gmail.com>\n" "Language-Team: Russian <gnome-cyr@gnome.org>\n" "Language: ru\n" @@ -38,15 +38,19 @@ msgstr "Экспорт фотографий" msgid "" "To export photos from Shotwell via drag and drop, drag the photos from " "Shotwell onto a file manager window or your desktop. The new files will be " -"full-sized copies of the photos in your library." +"full-sized copies of the photos in your library. To export the original " +"file, hold <keyseq><key>Shift</key></keyseq> while dropping the photo to the " +"file manager." msgstr "" "Чтобы экспортировать фотографии из Shotwell способом «drag-and-drop», " "перетащите фотографии из Shotwell в окно файлового менеджера или на рабочий " "стол. Новые файлы будут полноразмерными копиями фотографий из вашей " -"библиотеки." +"библиотеки. Чтобы экспортировать исходный файл, удерживайте нажатой клавишу " +"<keyseq><key>Shift</key></keyseq>, одновременно перемещая фотографию в " +"файловый менеджер." #. (itstool) path: page/p -#: C/share-export.page:18 +#: C/share-export.page:19 msgid "" "Alternatively, select a set of photos and choose the <guiseq><gui>File</" "gui><gui>Export...</gui></guiseq> command or press <keyseq><key>Shift</" @@ -62,12 +66,12 @@ msgstr "" "несколько вариантов:" #. (itstool) path: item/p -#: C/share-export.page:24 +#: C/share-export.page:25 msgid "A format for export." msgstr "Формат для экспорта." #. (itstool) path: item/p -#: C/share-export.page:27 +#: C/share-export.page:28 msgid "" "Choose <gui>Unmodified</gui> to export photos in their original format " "without any edits made in Shotwell. RAW photos will be exported in their " @@ -78,7 +82,7 @@ msgstr "" "RAW будут экспортированы в оригинальном формате." #. (itstool) path: item/p -#: C/share-export.page:29 +#: C/share-export.page:30 msgid "" "Choose <gui>Current</gui> to export photos including edits made in Shotwell. " "RAW photos will be exported in JPEG format if you have edited them in " @@ -90,7 +94,7 @@ msgstr "" "исходном формате RAW." #. (itstool) path: item/p -#: C/share-export.page:31 +#: C/share-export.page:32 msgid "" "Or you can choose a particular image format (JPEG, PNG, TIFF, BMP) to be " "used for exporting. Any edits made in Shotwell will be included, and " @@ -102,14 +106,14 @@ msgstr "" "формате." #. (itstool) path: item/p -#: C/share-export.page:37 +#: C/share-export.page:38 msgid "The image quality for exporting (Low, Medium, High, or Maximum)." msgstr "" "Качество изображения для экспорта (Низкое, Среднее, Высокое или " "Максимальное)." #. (itstool) path: item/p -#: C/share-export.page:38 +#: C/share-export.page:39 msgid "" "A scaling constraint (which means how Shotwell will decide to scale the " "photos down), and the desired pixel size." @@ -118,22 +122,22 @@ msgstr "" "масштаба фотографий) и желаемый размер в пикселях." #. (itstool) path: item/title -#: C/share-export.page:40 +#: C/share-export.page:41 msgid "Original size" msgstr "Исходный размер" #. (itstool) path: item/p -#: C/share-export.page:40 +#: C/share-export.page:41 msgid "Image will be exported without any scaling applied" msgstr "Изображение будет экспортировано без изменения размера" #. (itstool) path: item/title -#: C/share-export.page:41 +#: C/share-export.page:42 msgid "Longest edge" msgstr "Самый длинный край" #. (itstool) path: item/p -#: C/share-export.page:41 +#: C/share-export.page:42 msgid "" "Image will be exported by having its longest edge scaled to <gui>Pixels</" "gui> and the other according to the aspect ratio" @@ -143,12 +147,12 @@ msgstr "" "исходными пропорциями сторон" #. (itstool) path: item/title -#: C/share-export.page:42 +#: C/share-export.page:43 msgid "Width" msgstr "Ширина" #. (itstool) path: item/p -#: C/share-export.page:42 +#: C/share-export.page:43 msgid "" "The image width will have its width scaled to the given pixel size and its " "height according to the aspect ratio. This is equivalent to <gui>Longest " @@ -160,12 +164,12 @@ msgstr "" "ландшафтной ориентацией." #. (itstool) path: item/title -#: C/share-export.page:43 +#: C/share-export.page:44 msgid "Height" msgstr "Высота" #. (itstool) path: item/p -#: C/share-export.page:43 +#: C/share-export.page:44 msgid "" "The image height will have its height scaled to the given pixel size and its " "width according to the aspect ratio. This is equivalent to <gui>Longest " @@ -177,7 +181,7 @@ msgstr "" "портретной ориентацией." #. (itstool) path: item/p -#: C/share-export.page:46 +#: C/share-export.page:47 msgid "" "The option whether you like to export metadatas such as tags or ratings. " "This can help to save your privacy if you have geolocation tags or tags " @@ -189,7 +193,7 @@ msgstr "" "геолокации или любые другие другие установленные вами метки." #. (itstool) path: page/p -#: C/share-export.page:49 +#: C/share-export.page:50 msgid "" "If selected, Shotwell will write tags, titles, and other metadata to the new " "files." diff --git a/meson.build b/meson.build index 8789bfa..38d22b8 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('shotwell', ['vala', 'c'], - version : '0.32.4', + version : '0.32.6', meson_version : '>= 0.59.0', default_options : ['buildtype=debugoptimized']) @@ -49,7 +49,6 @@ gtk = dependency('gtk+-3.0', version : '>= 3.22') gio = dependency('gio-2.0', version: '>= 2.40') gmodule = dependency('gmodule-2.0', version: '>= 2.40') gee = dependency('gee-0.8', version: '>= 0.8.5') -webkit = dependency('webkit2gtk-4.1', version: '>= 2.26') soup = dependency('libsoup-3.0') json_glib = dependency('json-glib-1.0') xml = dependency('libxml-2.0') diff --git a/meson_options.txt b/meson_options.txt index 56df7ae..e4a6528 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,12 +1,12 @@ -option('unity_support', type: 'boolean', value : 'false', description: 'Enable Ubuntu Unity support') +option('unity_support', type: 'boolean', value : false, description: 'Enable Ubuntu Unity support') option('publishers', type: 'array', choices: ['flickr','googlephotos','piwigo','youtube','gallery3','tumblr'], value : ['flickr','googlephotos','piwigo','youtube','gallery3','tumblr'], description: 'The list of publishing plugins to build') option('trace', type: 'array', choices: ['dtors', 'import', 'md5', 'metadata-writer', 'monitoring', 'pixbuf-cache', 'reflow', 'reflow-items'], value : [], description: 'Enable various trace options') option('measure', type: 'array', choices: ['enhance', 'import', 'pipeline', 'view-filtering', 'thumbnail-cache'], value : [], description : 'Enable various timing measurements') -option('dupe_detection', type: 'boolean', value : 'true', description: 'Disable duplicate checks') -option('udev', type: 'boolean', value : 'true', description: 'Enable or disable udev support') -option('install_apport_hook', type : 'boolean', value : 'true', description: 'Enable Ubuntu apport hook') +option('dupe_detection', type: 'boolean', value : true, description: 'Disable duplicate checks') +option('udev', type: 'boolean', value : true, description: 'Enable or disable udev support') +option('install_apport_hook', type : 'boolean', value : true, description: 'Enable Ubuntu apport hook') option('face_detection', type:'boolean', value:false, description: 'Enable face detection and recognition features') -option('face_detection_helper', type : 'boolean', value : 'true', description : 'If face-detection is enabled, build the external helper tool') +option('face_detection_helper', type : 'boolean', value : true, description : 'If face-detection is enabled, build the external helper tool') option('face_detection_helper_bus', type:'combo', choices: ['private', 'session'], value : 'private', description: 'Which DBus bus to use for external helper tool') option('fatal_warnings', type:'boolean', value:false) option('extra_pixbuf_loaders_path', type:'string', value: '') diff --git a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala index 23de183..e381ae9 100644 --- a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala +++ b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala @@ -18,86 +18,26 @@ namespace Publishing.Authenticator.Shotwell.Flickr { internal const string SERVICE_DISCLAIMER = "<b>This product uses the Flickr API but is not endorsed or certified by SmugMug, Inc.</b>"; internal class AuthenticationRequestTransaction : Publishing.RESTSupport.OAuth1.Transaction { - public AuthenticationRequestTransaction(Publishing.RESTSupport.OAuth1.Session session) { + public AuthenticationRequestTransaction(Publishing.RESTSupport.OAuth1.Session session, string cookie) { base.with_uri(session, "https://www.flickr.com/services/oauth/request_token", Publishing.RESTSupport.HttpMethod.GET); - add_argument("oauth_callback", "shotwell-auth://local-callback"); + add_argument("oauth_callback", "shotwell-oauth2://localhost?sw_auth_cookie=%s".printf(cookie)); } } internal class AccessTokenFetchTransaction : Publishing.RESTSupport.OAuth1.Transaction { - public AccessTokenFetchTransaction(Publishing.RESTSupport.OAuth1.Session session, string user_verifier) { + public AccessTokenFetchTransaction(Publishing.RESTSupport.OAuth1.Session session, string user_verifier, string cookie) { base.with_uri(session, "https://www.flickr.com/services/oauth/access_token", Publishing.RESTSupport.HttpMethod.GET); add_argument("oauth_verifier", user_verifier); add_argument("oauth_token", session.get_request_phase_token()); - add_argument("oauth_callback", "shotwell-auth://local-callback"); - } - } - - internal class WebAuthenticationPane : Common.WebAuthenticationPane { - private string? auth_code = null; - private const string LOGIN_URI = "https://www.flickr.com/services/oauth/authorize?oauth_token=%s&perms=write"; - - public signal void authorized(string auth_code); - public signal void error(); - - public WebAuthenticationPane(string token) { - Object(login_uri : LOGIN_URI.printf(token)); - } - - public override void constructed() { - base.constructed(); - - var ctx = WebKit.WebContext.get_default(); - ctx.register_uri_scheme("shotwell-auth", this.on_shotwell_auth_request_cb); - - var mgr = ctx.get_security_manager(); - mgr.register_uri_scheme_as_secure("shotwell-auth"); - mgr.register_uri_scheme_as_cors_enabled("shotwell-auth"); - } - - public override void on_page_load() { - if (this.load_error != null) { - this.error(); - - return; - } - - try { - var uri = GLib.Uri.parse(get_view().get_uri(), GLib.UriFlags.NONE); - if (uri.get_scheme() == "shotwell-auth" && this.auth_code == null) { - var form_data = Soup.Form.decode (uri.get_query()); - this.auth_code = form_data.lookup("oauth_verifier"); - } - } catch (Error err) { - this.error(); - - return; - } - - if (this.auth_code != null) { - this.authorized(this.auth_code); - } - } - - private void on_shotwell_auth_request_cb(WebKit.URISchemeRequest request) { - try { - var uri = GLib.Uri.parse(request.get_uri(), GLib.UriFlags.NONE); - var form_data = Soup.Form.decode (uri.get_query()); - this.auth_code = form_data.lookup("oauth_verifier"); - } catch (Error err) { - debug ("Failed to parse URI %s: %s", request.get_uri(), err.message); - } - - var response = ""; - var mins = new MemoryInputStream.from_data(response.data); - request.finish(mins, -1, "text/plain"); + add_argument("oauth_callback", "shotwell-oauth2://localhost?sw_auth_cookie=%s".printf(cookie)); } } internal class Flickr : Publishing.Authenticator.Shotwell.OAuth1.Authenticator { - private WebAuthenticationPane pane; + private Common.ExternalWebPane pane; + private string auth_cookie = Uuid.string_random(); public Flickr(Spit.Publishing.PluginHost host) { base("Flickr", API_KEY, API_SECRET, host); @@ -147,7 +87,7 @@ namespace Publishing.Authenticator.Shotwell.Flickr { host.set_service_locked(true); host.install_static_message_pane(_("Preparing for login…")); - AuthenticationRequestTransaction txn = new AuthenticationRequestTransaction(session); + AuthenticationRequestTransaction txn = new AuthenticationRequestTransaction(session, auth_cookie); try { yield txn.execute_async(); debug("EVENT: OAuth authentication request transaction completed; response = '%s'", @@ -185,22 +125,33 @@ namespace Publishing.Authenticator.Shotwell.Flickr { session.set_request_phase_credentials(token, token_secret); - do_web_authentication(token); + do_web_authentication.begin(token); } - private void do_web_authentication(string token) { - pane = new WebAuthenticationPane(token); - host.install_dialog_pane(pane); - pane.authorized.connect((pin) => { this.do_verify_pin.begin(pin); }); - pane.error.connect(this.on_web_login_error); - } + private class AuthCallback : Spit.Publishing.AuthenticatedCallback, Object { + public signal void auth(GLib.HashTable<string, string> params); - private void on_web_login_error() { - if (pane.load_error != null) { - host.post_error(pane.load_error); - return; + public void authenticated(GLib.HashTable<string, string> params) { + auth(params); } - host.post_error(new Spit.Publishing.PublishingError.PROTOCOL_ERROR(_("Flickr authorization failed"))); + } + + private async void do_web_authentication(string token) { + var uri = "https://www.flickr.com/services/oauth/authorize?oauth_token=%s&perms=write".printf(token); + pane = new Common.ExternalWebPane(uri); + host.install_dialog_pane(pane); + var auth_callback = new AuthCallback(); + string? web_auth_code = null; + auth_callback.auth.connect((prm) => { + if ("oauth_verifier" in prm) { + web_auth_code = prm["oauth_verifier"]; + } + do_web_authentication.callback(); + }); + host.register_auth_callback(auth_cookie, auth_callback); + yield; + host.unregister_auth_callback(auth_cookie); + yield do_verify_pin(web_auth_code); } private async void do_verify_pin(string pin) { @@ -209,7 +160,7 @@ namespace Publishing.Authenticator.Shotwell.Flickr { host.set_service_locked(true); host.install_static_message_pane(_("Verifying authorization…")); - AccessTokenFetchTransaction txn = new AccessTokenFetchTransaction(session, pin); + AccessTokenFetchTransaction txn = new AccessTokenFetchTransaction(session, pin, auth_cookie); try { yield txn.execute_async(); diff --git a/plugins/authenticator/shotwell/GoogleAuthenticator.vala b/plugins/authenticator/shotwell/GoogleAuthenticator.vala index 9fc5b27..5a0d934 100644 --- a/plugins/authenticator/shotwell/GoogleAuthenticator.vala +++ b/plugins/authenticator/shotwell/GoogleAuthenticator.vala @@ -5,73 +5,11 @@ namespace Publishing.Authenticator.Shotwell.Google { private const string OAUTH_CLIENT_ID = "534227538559-hvj2e8bj0vfv2f49r7gvjoq6jibfav67.apps.googleusercontent.com"; private const string REVERSE_CLIENT_ID = "com.googleusercontent.apps.534227538559-hvj2e8bj0vfv2f49r7gvjoq6jibfav67"; private const string OAUTH_CLIENT_SECRET = "pwpzZ7W1TCcD5uIfYCu8sM7x"; - private const string OAUTH_CALLBACK_URI = REVERSE_CLIENT_ID + ":/auth-callback"; + private const string OAUTH_CALLBACK_URI = REVERSE_CLIENT_ID + ":/localhost"; private const string SCHEMA_KEY_PROFILE_ID = "shotwell-profile-id"; private const string SCHEMA_KEY_ACCOUNTNAME = "accountname"; - private class WebAuthenticationPane : Common.WebAuthenticationPane { - public static bool cache_dirty = false; - private string? auth_code = null; - - public signal void error(); - - public override void constructed() { - base.constructed(); - - var ctx = WebKit.WebContext.get_default(); - ctx.register_uri_scheme(REVERSE_CLIENT_ID, this.on_shotwell_auth_request_cb); - } - - public override void on_page_load() { - if (this.load_error != null) { - this.error (); - - return; - } - - try { - var uri = GLib.Uri.parse(get_view().get_uri(), UriFlags.NONE); - if (uri.get_scheme() == REVERSE_CLIENT_ID && this.auth_code == null) { - var form_data = Soup.Form.decode (uri.get_query()); - this.auth_code = form_data.lookup("code"); - } - } catch (Error err) { - debug ("Failed to parse auth code from URI %s: %s", get_view().get_uri(), - err.message); - } - - if (this.auth_code != null) { - this.authorized(this.auth_code); - } - } - - private void on_shotwell_auth_request_cb(WebKit.URISchemeRequest request) { - try { - var uri = GLib.Uri.parse(request.get_uri(), GLib.UriFlags.NONE); - debug("URI: %s", request.get_uri()); - var form_data = Soup.Form.decode (uri.get_query()); - this.auth_code = form_data.lookup("code"); - } catch (Error err) { - debug("Failed to parse request URI: %s", err.message); - } - - var response = ""; - var mins = new MemoryInputStream.from_data(response.data); - request.finish(mins, -1, "text/plain"); - } - - public signal void authorized(string auth_code); - - public WebAuthenticationPane(string auth_sequence_start_url) { - Object (login_uri : auth_sequence_start_url); - } - - public static bool is_cache_dirty() { - return cache_dirty; - } - } - private class Session : Publishing.RESTSupport.Session { public string access_token = null; public string refresh_token = null; @@ -132,7 +70,6 @@ namespace Publishing.Authenticator.Shotwell.Google { private string accountname = "default"; private Spit.Publishing.PluginHost host = null; private GLib.HashTable<string, Variant> params = null; - private WebAuthenticationPane web_auth_pane = null; private Session session = null; private string welcome_message = null; private Secret.Schema? schema = null; @@ -166,14 +103,7 @@ namespace Publishing.Authenticator.Shotwell.Google { return; } - // FIXME: Find a way for a proper logout - if (WebAuthenticationPane.is_cache_dirty()) { - host.set_service_locked(false); - - host.install_static_message_pane(_("You have already logged in and out of a Google service during this Shotwell session.\n\nTo continue publishing to Google services, quit and restart Shotwell, then try publishing again.")); - } else { - this.do_show_service_welcome_pane(); - } + this.do_show_service_welcome_pane(); } public bool can_logout() { @@ -202,8 +132,15 @@ namespace Publishing.Authenticator.Shotwell.Google { public void set_accountname(string accountname) { this.accountname = accountname; } + private class AuthCallback : Spit.Publishing.AuthenticatedCallback, Object { + public signal void auth(GLib.HashTable<string, string> params); + + public void authenticated(GLib.HashTable<string, string> params) { + auth(params); + } + } - private void do_hosted_web_authentication() { + private async void do_hosted_web_authentication() { debug("ACTION: running OAuth authentication flow in hosted web pane."); string user_authorization_url = "https://accounts.google.com/o/oauth2/auth?" + @@ -216,23 +153,26 @@ namespace Publishing.Authenticator.Shotwell.Google { "access_type=offline&" + "approval_prompt=force"; - web_auth_pane = new WebAuthenticationPane(user_authorization_url); - web_auth_pane.authorized.connect(on_web_auth_pane_authorized); - web_auth_pane.error.connect(on_web_auth_pane_error); - - host.install_dialog_pane(web_auth_pane); - } - - private void on_web_auth_pane_authorized(string auth_code) { - web_auth_pane.authorized.disconnect(on_web_auth_pane_authorized); - - debug("EVENT: user authorized scope %s with auth_code %s", scope, auth_code); - - do_get_access_tokens.begin(auth_code); - } + var auth_callback = new AuthCallback(); + string? web_auth_code = null; + auth_callback.auth.connect((prm) => { + if ("code" in prm) { + web_auth_code = prm["code"]; + } + do_hosted_web_authentication.callback(); + }); + host.register_auth_callback(REVERSE_CLIENT_ID, auth_callback); + try { + AppInfo.launch_default_for_uri(user_authorization_url, null); + host.install_login_wait_pane(); + yield; - private void on_web_auth_pane_error() { - host.post_error(web_auth_pane.load_error); + yield do_get_access_tokens(web_auth_code); + } catch (Error err) { + host.post_error(err); + } finally { + host.unregister_auth_callback(REVERSE_CLIENT_ID); + } } private async void do_get_access_tokens(string auth_code) { @@ -384,7 +324,6 @@ namespace Publishing.Authenticator.Shotwell.Google { } this.authenticated(); - web_auth_pane.clear(); } private async void do_exchange_refresh_token_for_access_token() { @@ -421,7 +360,6 @@ namespace Publishing.Authenticator.Shotwell.Google { Idle.add (() => { this.authenticate(); return false; }); } - web_auth_pane.clear(); host.post_error(err); } } @@ -435,7 +373,7 @@ namespace Publishing.Authenticator.Shotwell.Google { private void on_service_welcome_login() { debug("EVENT: user clicked 'Login' in welcome pane."); - this.do_hosted_web_authentication(); + this.do_hosted_web_authentication.begin(); } } } diff --git a/plugins/authenticator/shotwell/meson.build b/plugins/authenticator/shotwell/meson.build index 037ec3b..a6475e0 100644 --- a/plugins/authenticator/shotwell/meson.build +++ b/plugins/authenticator/shotwell/meson.build @@ -11,7 +11,7 @@ authenticator_shotwell_resources = gnome.compile_resources('authenticator-resour source_dir : meson.project_source_root()) authenticator_shotwell_deps = [gee, gtk, gio, soup, json_glib, sw_plugin, - sw_plugin_common_dep, json_glib, xml, webkit, secret] + sw_plugin_common_dep, json_glib, xml, secret] authenticator = library('shotwell-authenticator', authenticator_shotwell_sources + authenticator_shotwell_resources, diff --git a/plugins/common/WebAuthenticationPane.vala b/plugins/common/WebAuthenticationPane.vala index b9f7280..f745252 100644 --- a/plugins/common/WebAuthenticationPane.vala +++ b/plugins/common/WebAuthenticationPane.vala @@ -6,109 +6,44 @@ using Spit.Publishing; namespace Shotwell.Plugins.Common { - public abstract class WebAuthenticationPane : Spit.Publishing.DialogPane, Object { + public class ExternalWebPane : Spit.Publishing.DialogPane, Object { public DialogPane.GeometryOptions preferred_geometry { get; construct; default = DialogPane.GeometryOptions.COLOSSAL_SIZE; } - public string login_uri { owned get; construct; } - public Error load_error { get; private set; default = null; } - - private WebKit.WebView webview; - private Gtk.Widget widget; - private Gtk.Entry entry; + public Gtk.Widget widget; - public void clear() { - debug("Clearing the data of WebKit..."); - this.webview.get_website_data_manager().clear.begin(WebKit.WebsiteDataTypes.ALL, (GLib.TimeSpan)0); + public ExternalWebPane(string uri) { + Object(login_uri: uri); } + public signal void browser_toggled(); + public override void constructed () { base.constructed (); - var ctx = WebKit.WebContext.get_default(); - if (!ctx.get_sandbox_enabled()) { - ctx.set_sandbox_enabled(true); - } - - var box = new Gtk.Box(Gtk.Orientation.VERTICAL, 4); - this.widget = box; - this.entry = new Gtk.Entry(); - this.entry.editable = false; - this.entry.get_style_context().add_class("flat"); - this.entry.get_style_context().add_class("read-only"); - box.pack_start (entry, false, false, 6); - - this.webview = new WebKit.WebView (); - - this.webview.load_changed.connect (this.on_page_load_changed); - this.webview.load_failed.connect (this.on_page_load_failed); - this.webview.context_menu.connect ( () => { return false; }); - this.webview.decide_policy.connect (this.on_decide_policy); - this.webview.bind_property("uri", this.entry, "text", GLib.BindingFlags.DEFAULT); - box.pack_end (this.webview); - } - - private bool on_decide_policy(WebKit.PolicyDecision decision, WebKit.PolicyDecisionType type) { - switch (type) { - case WebKit.PolicyDecisionType.NEW_WINDOW_ACTION: { - var navigation = (WebKit.NavigationPolicyDecision) decision; - var action = navigation.get_navigation_action(); - var uri = action.get_request().uri; - decision.ignore(); - AppInfo.launch_default_for_uri_async.begin(uri, null); - return true; - } - default: - break; - } - - return false; - } - - public abstract void on_page_load (); - - protected void set_cursor (Gdk.CursorType type) { - var window = webview.get_window (); - if (window == null) - return; - - var display = window.get_display (); - if (display == null) - return; - - var cursor = new Gdk.Cursor.for_display (display, type); - window.set_cursor (cursor); - } - - private bool on_page_load_failed (WebKit.LoadEvent load_event, string uri, Error error) { - // OAuth call-back scheme. Produces a load error because it is not HTTP(S) - // Do not set the load_error, but continue the error handling - if (uri.has_prefix ("shotwell-auth://")) - return false; - - critical ("Failed to load uri %s: %s", uri, error.message); - this.load_error = error; - - return false; - } - - private void on_page_load_changed (WebKit.LoadEvent load_event) { - switch (load_event) { - case WebKit.LoadEvent.STARTED: - case WebKit.LoadEvent.REDIRECTED: - this.set_cursor (Gdk.CursorType.WATCH); - break; - case WebKit.LoadEvent.FINISHED: - this.set_cursor (Gdk.CursorType.LEFT_PTR); - this.on_page_load (); - break; - default: - break; - } - } - - public WebKit.WebView get_view () { - return this.webview; + var box = new Gtk.Box(Gtk.Orientation.VERTICAL, 18); + box.set_halign(Gtk.Align.CENTER); + box.hexpand = true; + box.set_valign(Gtk.Align.CENTER); + box.vexpand = true; + var image = new Gtk.Image.from_icon_name ("web-browser-symbolic", Gtk.IconSize.DIALOG); + image.get_style_context().add_class("dim-label"); + image.set_pixel_size(128); + box.add(image); + + var label = new Gtk.Label(_("Sign in with your browser to setup an account")); + label.get_style_context().add_class("heading"); + box.add(label); + var button = new Gtk.Button.with_label (_("Continue")); + button.set_halign(Gtk.Align.CENTER); + button.get_style_context().add_class ("suggested-action"); + button.clicked.connect(() => { + AppInfo.launch_default_for_uri_async.begin(login_uri, null); + browser_toggled(); + }); + box.pack_end(button); + + widget = box; } public DialogPane.GeometryOptions get_preferred_geometry() { @@ -120,11 +55,9 @@ namespace Shotwell.Plugins.Common { } public void on_pane_installed () { - this.get_view ().load_uri (this.login_uri); } public void on_pane_uninstalled() { - this.clear(); - } - } + } + } } diff --git a/plugins/meson.build b/plugins/meson.build index e9c0e49..bd4ac9e 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -7,7 +7,7 @@ sw_plugin_common = library('shotwell-plugin-common', 'common/BuilderPane.vala', 'common/OAuth1Support.vala'], version: meson.project_version(), - dependencies : [gtk, gee, webkit, soup, xml, sw_plugin], + dependencies : [gtk, gee, soup, xml, sw_plugin], vala_header : 'shotwell-plugin-common.h', vala_vapi : 'shotwell-plugin-common.vapi', include_directories : config_incdir, diff --git a/plugins/shotwell-publishing/meson.build b/plugins/shotwell-publishing/meson.build index a93726b..962195c 100644 --- a/plugins/shotwell-publishing/meson.build +++ b/plugins/shotwell-publishing/meson.build @@ -18,7 +18,7 @@ shotwell_publishing_resources = gnome.compile_resources('publishing-resource', shared_module('shotwell-publishing', shotwell_publishing_sources + shotwell_publishing_resources, dependencies : [gtk, soup, gexiv2, gee, sw_plugin, json_glib, - webkit, sw_plugin_common_dep, xml, gcr, + sw_plugin_common_dep, xml, gcr, gcr_ui, authenticator_dep, secret], c_args : ['-DPLUGIN_RESOURCE_PATH="/org/gnome/Shotwell/Publishing"', '-DGCR_API_SUBJECT_TO_CHANGE'], diff --git a/plugins/shotwell-transitions/meson.build b/plugins/shotwell-transitions/meson.build index 8134292..f809ade 100644 --- a/plugins/shotwell-transitions/meson.build +++ b/plugins/shotwell-transitions/meson.build @@ -20,7 +20,7 @@ libm = cc.find_library('m', required : false) shared_module('shotwell-transitions', shotwell_transitions_sources + shotwell_transitions_resources, dependencies : [gio, gdk_pixbuf, cairo, gtk, gdk, xml, sw_plugin, - sw_plugin_common_dep, gee, soup, webkit, libm], + sw_plugin_common_dep, gee, soup, libm], vala_args : [ '--gresources', 'org.gnome.Shotwell.Transitions.gresource.xml', ], @@ -46,19 +46,19 @@ msgid "" msgstr "" "Project-Id-Version: master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/shotwell/issues\n" -"POT-Creation-Date: 2023-04-12 18:51+0000\n" -"PO-Revision-Date: 2023-04-18 11:20+0200\n" -"Last-Translator: Philipp Kiemle <philipp.kiemle@gmail.com>\n" +"POT-Creation-Date: 2023-11-25 17:35+0000\n" +"PO-Revision-Date: 2023-11-25 20:06+0100\n" +"Last-Translator: Jürgen Benvenuti <gastornis@posteo.org>\n" "Language-Team: German <gnome-de@gnome.org>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Poedit 3.4\n" #: data/gsettings/org.gnome.shotwell-extras.gschema.xml:6 -#: data/gsettings/org.gnome.shotwell.gschema.xml:428 +#: data/gsettings/org.gnome.shotwell.gschema.xml:438 msgid "OAuth Access Phase Token" msgstr "OAuth-Token für die Zugriffsphase" @@ -69,7 +69,7 @@ msgstr "" "vorhanden" #: data/gsettings/org.gnome.shotwell-extras.gschema.xml:12 -#: data/gsettings/org.gnome.shotwell.gschema.xml:434 +#: data/gsettings/org.gnome.shotwell.gschema.xml:444 msgid "OAuth Access Phase Token Secret" msgstr "OAuth-Token-Geheimnis für die Zugriffsphase" @@ -83,19 +83,19 @@ msgstr "" "verwendet wird, falls vorhanden" #: data/gsettings/org.gnome.shotwell-extras.gschema.xml:18 -#: data/gsettings/org.gnome.shotwell.gschema.xml:440 -#: data/gsettings/org.gnome.shotwell.gschema.xml:498 -#: data/gsettings/org.gnome.shotwell.gschema.xml:560 +#: data/gsettings/org.gnome.shotwell.gschema.xml:450 +#: data/gsettings/org.gnome.shotwell.gschema.xml:508 +#: data/gsettings/org.gnome.shotwell.gschema.xml:570 msgid "username" msgstr "Benutzername" #: data/gsettings/org.gnome.shotwell-extras.gschema.xml:19 -#: data/gsettings/org.gnome.shotwell.gschema.xml:441 +#: data/gsettings/org.gnome.shotwell.gschema.xml:451 msgid "The user name of the currently logged in Flickr user, if any" msgstr "Name des aktuell angemeldeten Flickr-Benutzers, falls vorhanden" #: data/gsettings/org.gnome.shotwell-extras.gschema.xml:24 -#: data/gsettings/org.gnome.shotwell.gschema.xml:472 +#: data/gsettings/org.gnome.shotwell.gschema.xml:482 msgid "default size" msgstr "Standardgröße" @@ -443,62 +443,73 @@ msgid "Whether to show the title of a photo during the slideshow" msgstr "" "Legt fest, ob der Titel einer Bildes in einer Diaschau angezeigt werden soll" -#: data/gsettings/org.gnome.shotwell.gschema.xml:218 +#: data/gsettings/org.gnome.shotwell.gschema.xml:216 +#: data/ui/slideshow_settings.ui:154 +msgid "Shuffle" +msgstr "Durchmischen" + +#: data/gsettings/org.gnome.shotwell.gschema.xml:217 +msgid "Whether to shuffle the order of photos during the slideshow" +msgstr "" +"Legt fest, ob die Reihenfolge der Bilder in der Diaschau durchgemischt " +"werden soll" + +#: data/gsettings/org.gnome.shotwell.gschema.xml:224 msgid "maximize library window" msgstr "Bibliotheksfenster maximieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:219 +#: data/gsettings/org.gnome.shotwell.gschema.xml:225 msgid "True if library application is maximized, false otherwise" msgstr "Legt fest, ob das Bibliotheksfenster maximiert ist oder nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:224 +#: data/gsettings/org.gnome.shotwell.gschema.xml:230 msgid "width of library window" msgstr "Breite des Bibliotheksfensters" -#: data/gsettings/org.gnome.shotwell.gschema.xml:225 +#: data/gsettings/org.gnome.shotwell.gschema.xml:231 msgid "The last recorded width of the library application window" msgstr "Die zuletzt gespeicherte Breite des Bibliotheksfensters der Anwendung" -#: data/gsettings/org.gnome.shotwell.gschema.xml:230 +#: data/gsettings/org.gnome.shotwell.gschema.xml:236 msgid "height of library window" msgstr "Höhe des Bibliotheksfensters" -#: data/gsettings/org.gnome.shotwell.gschema.xml:231 +#: data/gsettings/org.gnome.shotwell.gschema.xml:237 msgid "The last recorded height of the library application window" msgstr "Die zuletzt gespeicherte Höhe des Bibliotheksfensters der Anwendung" -#: data/gsettings/org.gnome.shotwell.gschema.xml:236 +#: data/gsettings/org.gnome.shotwell.gschema.xml:242 msgid "maximize direct-edit window" msgstr "Direktbearbeitungsfenster maximieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:237 +#: data/gsettings/org.gnome.shotwell.gschema.xml:243 msgid "True if direct-edit application is maximized, false otherwise" msgstr "" "Legt fest, ob das Direktbearbeitungsfenster maximiert werden soll oder nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:242 +#: data/gsettings/org.gnome.shotwell.gschema.xml:248 msgid "width of direct-edit window" msgstr "Breite des Direktbearbeitungsfensters" -#: data/gsettings/org.gnome.shotwell.gschema.xml:243 +#: data/gsettings/org.gnome.shotwell.gschema.xml:249 msgid "The last recorded width of the direct-edit application window" msgstr "" "Die zuletzt gespeicherte Breite des Direktbearbeitungsfensters der Anwendung" -#: data/gsettings/org.gnome.shotwell.gschema.xml:248 +#: data/gsettings/org.gnome.shotwell.gschema.xml:254 msgid "height of direct-edit window" msgstr "Höhe des Direktbearbeitungsfensters" -#: data/gsettings/org.gnome.shotwell.gschema.xml:249 +#: data/gsettings/org.gnome.shotwell.gschema.xml:255 msgid "The last recorded height of the direct-edit application window" msgstr "" "Die zuletzt gespeicherte Höhe des Direktbearbeitungsfensters der Anwendung" -#: data/gsettings/org.gnome.shotwell.gschema.xml:254 +#: data/gsettings/org.gnome.shotwell.gschema.xml:260 msgid "sidebar divider position" msgstr "Position des Seitenleistentrenners" -#: data/gsettings/org.gnome.shotwell.gschema.xml:255 +#: data/gsettings/org.gnome.shotwell.gschema.xml:261 msgid "" "The last recorded position of the divider between the sidebar and view in " "library application window" @@ -506,30 +517,30 @@ msgstr "" "Die zuletzt gespeicherte Position des Trenners zwischen der Werkzeugleiste " "und der Ansicht im Bibliotheksfenster der Anwendung" -#: data/gsettings/org.gnome.shotwell.gschema.xml:262 +#: data/gsettings/org.gnome.shotwell.gschema.xml:268 msgid "import directory" msgstr "Import-Ordner" -#: data/gsettings/org.gnome.shotwell.gschema.xml:263 +#: data/gsettings/org.gnome.shotwell.gschema.xml:269 msgid "Directory in which imported photo files are placed" msgstr "Ordner, in den importierte Fotodateien abgelegt werden" -#: data/gsettings/org.gnome.shotwell.gschema.xml:268 +#: data/gsettings/org.gnome.shotwell.gschema.xml:274 msgid "watch library directory for new files" msgstr "Bibliotheksordner auf neue Dateien überwachen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:269 +#: data/gsettings/org.gnome.shotwell.gschema.xml:275 msgid "" "If true, files added to the library directory are automatically imported" msgstr "" "Legt fest, ob die zum Bibliotheksordner hinzugefügten Dateien automatisch " "importiert werden sollen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:274 +#: data/gsettings/org.gnome.shotwell.gschema.xml:280 msgid "write metadata to master files" msgstr "Metadaten in Master-Dateien schreiben" -#: data/gsettings/org.gnome.shotwell.gschema.xml:275 +#: data/gsettings/org.gnome.shotwell.gschema.xml:281 msgid "" "If true, changes to metadata (tags, titles, etc.) are written to the master " "photo file" @@ -537,11 +548,11 @@ msgstr "" "Legt fest, ob geänderte Metadaten (Stichworte, Titel usw.) in die Master-" "Datei geschrieben werden sollen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:280 +#: data/gsettings/org.gnome.shotwell.gschema.xml:286 msgid "use lowercase filenames" msgstr "Dateinamen in Kleinschreibung" -#: data/gsettings/org.gnome.shotwell.gschema.xml:281 +#: data/gsettings/org.gnome.shotwell.gschema.xml:287 msgid "" "If true, Shotwell will convert all filenames to lowercase when importing " "photo files" @@ -549,11 +560,11 @@ msgstr "" "Legt fest, ob Shotwell beim Import von Fotodateien alle Dateinamen in " "Kleinbuchstaben umwandeln soll" -#: data/gsettings/org.gnome.shotwell.gschema.xml:286 +#: data/gsettings/org.gnome.shotwell.gschema.xml:292 msgid "directory pattern" msgstr "Muster für Ordnernamen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:287 +#: data/gsettings/org.gnome.shotwell.gschema.xml:293 msgid "" "A string encoding a naming pattern that will be used to name photo " "directories on import" @@ -561,11 +572,11 @@ msgstr "" "Eine Zeichenkette, die als Namensmuster beim Benennen der importierten Foto-" "Ordner verwendet wird" -#: data/gsettings/org.gnome.shotwell.gschema.xml:292 +#: data/gsettings/org.gnome.shotwell.gschema.xml:298 msgid "directory pattern custom" msgstr "Benutzerdefiniertes Muster für Ordnernamen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:293 +#: data/gsettings/org.gnome.shotwell.gschema.xml:299 msgid "" "A string encoding a custom naming pattern that will be used to name photo " "directories on import" @@ -573,32 +584,32 @@ msgstr "" "Eine Zeichenkette, die als benutzerdefiniertes Namensmuster beim Benennen " "der importierten Foto-Ordner verwendet wird" -#: data/gsettings/org.gnome.shotwell.gschema.xml:298 +#: data/gsettings/org.gnome.shotwell.gschema.xml:304 msgid "RAW developer default" msgstr "Standard-RAW-Entwickler" -#: data/gsettings/org.gnome.shotwell.gschema.xml:299 +#: data/gsettings/org.gnome.shotwell.gschema.xml:305 msgid "Default option for which RAW developer Shotwell will use" msgstr "Vorgabe für den von Shotwell zu verwendenden RAW-Entwickler" -#: data/gsettings/org.gnome.shotwell.gschema.xml:306 +#: data/gsettings/org.gnome.shotwell.gschema.xml:312 msgid "Most-recently-used crop aspect ratio menu choice" msgstr "" "Das im Menü am häufigsten ausgewählte Seitenverhältnis beim Zuschneiden" -#: data/gsettings/org.gnome.shotwell.gschema.xml:307 +#: data/gsettings/org.gnome.shotwell.gschema.xml:313 msgid "A numeric code representing the last crop menu choice the user made" msgstr "" "Ein Zahlencode, der das im Menü am häufigsten ausgewählte Seitenverhältnis " "beim Zuschneiden darstellt" -#: data/gsettings/org.gnome.shotwell.gschema.xml:311 +#: data/gsettings/org.gnome.shotwell.gschema.xml:317 msgid "Most-recently-used crop custom aspect ratio’s numerator" msgstr "" "Erster Wert (Zähler) des zuletzt verwendeten benutzerdefinierten " "Seitenverhältnisses beim Zuschneiden" -#: data/gsettings/org.gnome.shotwell.gschema.xml:312 +#: data/gsettings/org.gnome.shotwell.gschema.xml:318 msgid "" "A nonzero, positive integer representing the width part of the last custom " "crop ratio the user entered" @@ -606,13 +617,13 @@ msgstr "" "Eine von Null verschiedene, positive Ganzzahl, die die Breite des zuletzt " "genutzten und gespeicherten Höhe des Zuschnittverhältnisses darstellt." -#: data/gsettings/org.gnome.shotwell.gschema.xml:316 +#: data/gsettings/org.gnome.shotwell.gschema.xml:322 msgid "Most-recently-used crop custom aspect ratio’s denominator" msgstr "" "Zweiter Wert (Nenner) des zuletzt verwendeten benutzerdefinierten " "Seitenverhältnisses beim Zuschneiden" -#: data/gsettings/org.gnome.shotwell.gschema.xml:317 +#: data/gsettings/org.gnome.shotwell.gschema.xml:323 msgid "" "A nonzero, positive integer representing the height part of the last custom " "crop ratio the user entered" @@ -620,90 +631,90 @@ msgstr "" "Eine von Null verschiedene, positive Ganzzahl, die die Höhe des zuletzt " "genutzten und gespeicherten Zuschnittverhältnisses darstellt." -#: data/gsettings/org.gnome.shotwell.gschema.xml:324 +#: data/gsettings/org.gnome.shotwell.gschema.xml:330 msgid "external photo editor" msgstr "Externer Foto-Editor" -#: data/gsettings/org.gnome.shotwell.gschema.xml:325 +#: data/gsettings/org.gnome.shotwell.gschema.xml:331 msgid "External application used to edit photos" msgstr "Externe Anwendung zum Bearbeiten von Fotos" -#: data/gsettings/org.gnome.shotwell.gschema.xml:330 +#: data/gsettings/org.gnome.shotwell.gschema.xml:336 msgid "external raw editor" msgstr "Externer RAW-Editor" -#: data/gsettings/org.gnome.shotwell.gschema.xml:331 +#: data/gsettings/org.gnome.shotwell.gschema.xml:337 msgid "External application used to edit RAW photos" msgstr "Externe Anwendung zum Bearbeiten von RAW-Fotos" -#: data/gsettings/org.gnome.shotwell.gschema.xml:369 -#: data/gsettings/org.gnome.shotwell.gschema.xml:370 +#: data/gsettings/org.gnome.shotwell.gschema.xml:379 +#: data/gsettings/org.gnome.shotwell.gschema.xml:380 msgid "Setting in export dialog: how to trim images" msgstr "Einstellung im Exportdialog: Zuschneiden von Bildern" -#: data/gsettings/org.gnome.shotwell.gschema.xml:375 +#: data/gsettings/org.gnome.shotwell.gschema.xml:385 msgid "export metadata" msgstr "Metadaten exportieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:376 +#: data/gsettings/org.gnome.shotwell.gschema.xml:386 msgid "Setting in export dialog: option to export metadata" msgstr "Einstellung im Exportdialog: Option zum Exportieren von Metadaten" -#: data/gsettings/org.gnome.shotwell.gschema.xml:381 +#: data/gsettings/org.gnome.shotwell.gschema.xml:391 msgid "format setting, special value" msgstr "Formatierungseinstellung, spezieller Wert" -#: data/gsettings/org.gnome.shotwell.gschema.xml:382 +#: data/gsettings/org.gnome.shotwell.gschema.xml:392 msgid "Setting in export dialog: format setting, special value" msgstr "Einstellung im Exportdialog: Formatierungseinstellung, spezieller Wert" -#: data/gsettings/org.gnome.shotwell.gschema.xml:387 +#: data/gsettings/org.gnome.shotwell.gschema.xml:397 msgid "format setting, type value" msgstr "Formatierungseinstellung, Typwert" -#: data/gsettings/org.gnome.shotwell.gschema.xml:388 +#: data/gsettings/org.gnome.shotwell.gschema.xml:398 msgid "Setting in export dialog: format setting, type value" msgstr "Einstellung im Exportdialog: Formatierungseinstellung, Typwert" -#: data/gsettings/org.gnome.shotwell.gschema.xml:393 +#: data/gsettings/org.gnome.shotwell.gschema.xml:403 msgid "JPEG quality option" msgstr "JPEG-Qualitätsoption" -#: data/gsettings/org.gnome.shotwell.gschema.xml:394 +#: data/gsettings/org.gnome.shotwell.gschema.xml:404 msgid "Setting in export dialog: jpeg quality option" msgstr "Einstellung im Exportdialog: JPEG-Qualitätsoption" -#: data/gsettings/org.gnome.shotwell.gschema.xml:399 +#: data/gsettings/org.gnome.shotwell.gschema.xml:409 msgid "maximal size of image" msgstr "Maximale Bildgröße" -#: data/gsettings/org.gnome.shotwell.gschema.xml:400 +#: data/gsettings/org.gnome.shotwell.gschema.xml:410 msgid "Setting in export dialog: maximal size of image" msgstr "Einstellung im Exportdialog: Maximale Bildgröße" -#: data/gsettings/org.gnome.shotwell.gschema.xml:407 +#: data/gsettings/org.gnome.shotwell.gschema.xml:417 msgid "last used publishing service" msgstr "Zuletzt genutzter Veröffentlichungsdienst" -#: data/gsettings/org.gnome.shotwell.gschema.xml:408 -#: data/gsettings/org.gnome.shotwell.gschema.xml:414 +#: data/gsettings/org.gnome.shotwell.gschema.xml:418 +#: data/gsettings/org.gnome.shotwell.gschema.xml:424 msgid "" "A numeric code representing the last service to which photos were published" msgstr "" "Ein Zahlencode, der den letzten Dienst darstellt, bei dem Fotos " "veröffentlicht wurden" -#: data/gsettings/org.gnome.shotwell.gschema.xml:413 +#: data/gsettings/org.gnome.shotwell.gschema.xml:423 msgid "default publishing service" msgstr "Standard-Veröffentlichungsdienst" -#: data/gsettings/org.gnome.shotwell.gschema.xml:429 +#: data/gsettings/org.gnome.shotwell.gschema.xml:439 msgid "The authorization token for the currently logged in Flickr user, if any" msgstr "" "Authentifizierungs-Token für den aktuell angemeldeten Facebook-Benutzer, " "falls vorhanden" -#: data/gsettings/org.gnome.shotwell.gschema.xml:435 +#: data/gsettings/org.gnome.shotwell.gschema.xml:445 msgid "" "The cryptographic secret used to sign requests against the authorization " "token for the currently logged in Flickr user, if any" @@ -712,22 +723,22 @@ msgstr "" "Authentifizierungs-Token des zur Zeit angemeldeten Flickr-Benutzers " "verwendet wird, soweit vorhanden" -#: data/gsettings/org.gnome.shotwell.gschema.xml:446 +#: data/gsettings/org.gnome.shotwell.gschema.xml:456 msgid "default size code" msgstr "Code für Standardgröße" -#: data/gsettings/org.gnome.shotwell.gschema.xml:447 +#: data/gsettings/org.gnome.shotwell.gschema.xml:457 msgid "" "A numeric code representing the default size for photos published to Flickr" msgstr "" "Ein Zahlencode, der die Standardgröße für Fotos darstellt, die zu Flickr " "hochgeladen werden sollen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:452 +#: data/gsettings/org.gnome.shotwell.gschema.xml:462 msgid "default visibility" msgstr "Standard-Sichtbarkeit" -#: data/gsettings/org.gnome.shotwell.gschema.xml:453 +#: data/gsettings/org.gnome.shotwell.gschema.xml:463 msgid "" "A numeric code representing the default visibility for photos published to " "Flickr" @@ -735,26 +746,26 @@ msgstr "" "Ein Zahlencode, der die Standard-Sichtbarkeit für Fotos darstellt, die zu " "Flickr hochgeladen werden sollen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:458 -#: data/gsettings/org.gnome.shotwell.gschema.xml:484 -#: data/gsettings/org.gnome.shotwell.gschema.xml:534 -#: data/gsettings/org.gnome.shotwell.gschema.xml:584 +#: data/gsettings/org.gnome.shotwell.gschema.xml:468 +#: data/gsettings/org.gnome.shotwell.gschema.xml:494 +#: data/gsettings/org.gnome.shotwell.gschema.xml:544 +#: data/gsettings/org.gnome.shotwell.gschema.xml:594 msgid "remove sensitive info from uploads" msgstr "Sensible Informationen entfernen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:459 +#: data/gsettings/org.gnome.shotwell.gschema.xml:469 msgid "" "Whether images being uploaded to Flickr should have their metadata removed " "first" msgstr "" "Legt fest, ob Metadaten vor dem Hochladen zu Flickr entfernt werden sollen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:466 -#: data/gsettings/org.gnome.shotwell.gschema.xml:604 +#: data/gsettings/org.gnome.shotwell.gschema.xml:476 +#: data/gsettings/org.gnome.shotwell.gschema.xml:614 msgid "refresh token" msgstr "Auffrischungs-Token" -#: data/gsettings/org.gnome.shotwell.gschema.xml:467 +#: data/gsettings/org.gnome.shotwell.gschema.xml:477 msgid "" "The OAuth token used to refresh the Google Photos session for the currently " "logged in user, if any" @@ -762,7 +773,7 @@ msgstr "" "Der OAuth-Token, der beim Auffrischen der Google Fotos-Sitzung des aktuell " "angemeldeten Benutzers verwendet wird, soweit vorhanden" -#: data/gsettings/org.gnome.shotwell.gschema.xml:473 +#: data/gsettings/org.gnome.shotwell.gschema.xml:483 msgid "" "A numeric code representing the default size for photos uploaded to Google " "Photos Albums" @@ -770,19 +781,19 @@ msgstr "" "Ein Zahlencode, der die Standardgröße für Fotos darstellt, die zu Google " "Fotos-Alben hochgeladen werden sollen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:478 -#: data/gsettings/org.gnome.shotwell.gschema.xml:578 +#: data/gsettings/org.gnome.shotwell.gschema.xml:488 +#: data/gsettings/org.gnome.shotwell.gschema.xml:588 msgid "last album" msgstr "Letztes Album" -#: data/gsettings/org.gnome.shotwell.gschema.xml:479 -#: data/gsettings/org.gnome.shotwell.gschema.xml:579 +#: data/gsettings/org.gnome.shotwell.gschema.xml:489 +#: data/gsettings/org.gnome.shotwell.gschema.xml:589 msgid "The name of the last album the user published photos to, if any" msgstr "" "Der Name des letzten Albums, in dem der Benutzer Fotos veröffentlicht hat, " "falls vorhanden" -#: data/gsettings/org.gnome.shotwell.gschema.xml:485 +#: data/gsettings/org.gnome.shotwell.gschema.xml:495 msgid "" "Whether images being uploaded to Google Photos should have their metadata " "removed first" @@ -790,55 +801,55 @@ msgstr "" "Legt fest, ob Metadaten vor dem Hochladen zu Google Fotos entfernt werden " "sollen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:492 +#: data/gsettings/org.gnome.shotwell.gschema.xml:502 msgid "Piwigo URL" msgstr "Piwigo-Adresse" -#: data/gsettings/org.gnome.shotwell.gschema.xml:493 +#: data/gsettings/org.gnome.shotwell.gschema.xml:503 msgid "URL of the Piwigo server" msgstr "Adresse des Piwigo-Servers" -#: data/gsettings/org.gnome.shotwell.gschema.xml:499 +#: data/gsettings/org.gnome.shotwell.gschema.xml:509 msgid "Piwigo username, if logged in" msgstr "Piwigo-Benutzername, falls angemeldet" -#: data/gsettings/org.gnome.shotwell.gschema.xml:504 +#: data/gsettings/org.gnome.shotwell.gschema.xml:514 msgid "password" msgstr "Passwort" -#: data/gsettings/org.gnome.shotwell.gschema.xml:505 +#: data/gsettings/org.gnome.shotwell.gschema.xml:515 msgid "Piwigo password, if logged in" msgstr "Piwigo-Passwort, falls angemeldet" -#: data/gsettings/org.gnome.shotwell.gschema.xml:510 +#: data/gsettings/org.gnome.shotwell.gschema.xml:520 msgid "remember password" msgstr "Passwort speichern" -#: data/gsettings/org.gnome.shotwell.gschema.xml:511 +#: data/gsettings/org.gnome.shotwell.gschema.xml:521 msgid "If true, remember the Piwigo password" msgstr "Legt fest, ob das Piwigo-Passwort gespeichert werden soll" -#: data/gsettings/org.gnome.shotwell.gschema.xml:516 +#: data/gsettings/org.gnome.shotwell.gschema.xml:526 msgid "last category" msgstr "Letzte Kategorie" -#: data/gsettings/org.gnome.shotwell.gschema.xml:517 +#: data/gsettings/org.gnome.shotwell.gschema.xml:527 msgid "The last selected Piwigo category" msgstr "Die zuletzt in Piwigo ausgewählte Kategorie" -#: data/gsettings/org.gnome.shotwell.gschema.xml:522 +#: data/gsettings/org.gnome.shotwell.gschema.xml:532 msgid "last permission level" msgstr "Letzte Zugriffsstufe" -#: data/gsettings/org.gnome.shotwell.gschema.xml:523 +#: data/gsettings/org.gnome.shotwell.gschema.xml:533 msgid "The last chosen Piwigo permission level" msgstr "Die zuletzt gewählte Zugriffsstufe bei Piwigo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:528 +#: data/gsettings/org.gnome.shotwell.gschema.xml:538 msgid "last photo size" msgstr "Letzte Bildgröße" -#: data/gsettings/org.gnome.shotwell.gschema.xml:529 +#: data/gsettings/org.gnome.shotwell.gschema.xml:539 msgid "" "A numeric code representing the last photo size preset used when publishing " "to Piwigo" @@ -846,21 +857,21 @@ msgstr "" "Ein Zahlencode, der die Größenvorlage des letzten Fotos darstellt, das zu " "Piwigo hochgeladen wurde" -#: data/gsettings/org.gnome.shotwell.gschema.xml:535 +#: data/gsettings/org.gnome.shotwell.gschema.xml:545 msgid "" "Whether images being uploaded to Piwigo should have their metadata removed " "first" msgstr "" "Legt fest, ob Metadaten vor dem Hochladen zu Piwigo entfernt werden sollen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:540 +#: data/gsettings/org.gnome.shotwell.gschema.xml:550 msgid "" "if title is set and comment unset, use title as comment for uploads to Piwigo" msgstr "" "Falls ein Titel und kein Kommentar gesetzt ist, den Titel als Kommentar beim " "Hochladen zu Piwigo verwenden" -#: data/gsettings/org.gnome.shotwell.gschema.xml:541 +#: data/gsettings/org.gnome.shotwell.gschema.xml:551 msgid "" "Whether images being uploaded to Piwigo should have their comment set from " "the title if title is set and comment unset" @@ -868,11 +879,11 @@ msgstr "" "Legt fest, ob beim Hochladen von Bildern zu Piwigo die Kommentare aus den " "Titeln erzeugt werden, sofern Titel, aber keine Kommentare festgelegt sind" -#: data/gsettings/org.gnome.shotwell.gschema.xml:546 +#: data/gsettings/org.gnome.shotwell.gschema.xml:556 msgid "do not upload tags when uploading to Piwigo" msgstr "Keine Stichworte zu Piwigo hochladen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:547 +#: data/gsettings/org.gnome.shotwell.gschema.xml:557 msgid "" "Whether images being uploaded to Piwigo should have their tags removed on " "upload, such that these tags will not appear on the remote Piwigo server" @@ -881,11 +892,11 @@ msgstr "" "werden sollen, so dass diese auf dem entfernten Piwigo-Server nicht " "erscheinen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:552 +#: data/gsettings/org.gnome.shotwell.gschema.xml:562 msgid "do not upload ratings when uploading to Piwigo" msgstr "keine Bewertungen zu Piwigo hochladen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:553 +#: data/gsettings/org.gnome.shotwell.gschema.xml:563 msgid "" "Whether images being uploaded to Piwigo should have their ratings uploaded, " "such that these ratings will not appear on the remote Piwigo server" @@ -894,27 +905,27 @@ msgstr "" "werden sollen, so dass diese auf dem entfernten Piwigo-Server nicht " "erscheinen." -#: data/gsettings/org.gnome.shotwell.gschema.xml:561 +#: data/gsettings/org.gnome.shotwell.gschema.xml:571 msgid "Gallery3 username" msgstr "Gallery3-Benutzername" -#: data/gsettings/org.gnome.shotwell.gschema.xml:566 +#: data/gsettings/org.gnome.shotwell.gschema.xml:576 msgid "API key" msgstr "API-Schlüssel" -#: data/gsettings/org.gnome.shotwell.gschema.xml:567 +#: data/gsettings/org.gnome.shotwell.gschema.xml:577 msgid "Gallery3 API key" msgstr "Gallery3-API-Schlüssel" -#: data/gsettings/org.gnome.shotwell.gschema.xml:572 +#: data/gsettings/org.gnome.shotwell.gschema.xml:582 msgid "URL" msgstr "Adresse" -#: data/gsettings/org.gnome.shotwell.gschema.xml:573 +#: data/gsettings/org.gnome.shotwell.gschema.xml:583 msgid "Gallery3 site URL" msgstr "Gallery3-Adresse" -#: data/gsettings/org.gnome.shotwell.gschema.xml:585 +#: data/gsettings/org.gnome.shotwell.gschema.xml:595 msgid "" "Whether images being uploaded to Gallery3 should have their metadata removed " "first" @@ -922,19 +933,19 @@ msgstr "" "Legt fest, ob die Metadaten der Bilder vor dem Hochladen zu Gallery3 " "entfernt werden sollen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:590 +#: data/gsettings/org.gnome.shotwell.gschema.xml:600 msgid "scaling constraint of uploaded picture" msgstr "Skalierungsbeschränkung des hochgeladenen Bildes" -#: data/gsettings/org.gnome.shotwell.gschema.xml:591 +#: data/gsettings/org.gnome.shotwell.gschema.xml:601 msgid "The scaling constraint ID of the picture to be uploaded" msgstr "Die Kennung der Skalierungsbeschränkung des hochgeladenen Bildes" -#: data/gsettings/org.gnome.shotwell.gschema.xml:596 +#: data/gsettings/org.gnome.shotwell.gschema.xml:606 msgid "pixels of the major axis uploaded picture" msgstr "Pixel der Hauptachse des hochgeladenen Bildes" -#: data/gsettings/org.gnome.shotwell.gschema.xml:597 +#: data/gsettings/org.gnome.shotwell.gschema.xml:607 msgid "" "The pixels of the major axis of the picture to be uploaded; used only if " "scaling-constraint-id is an appropriate value" @@ -942,7 +953,7 @@ msgstr "" "Pixel der Hauptachse des hochzuladenden Bildes. Dies wird nur verwendet, " "wenn scaling-constraint-id auf einen entsprechenden Wert gesetzt ist" -#: data/gsettings/org.gnome.shotwell.gschema.xml:605 +#: data/gsettings/org.gnome.shotwell.gschema.xml:615 msgid "" "The OAuth token used to refresh the YouTube session for the currently logged " "in user, if any" @@ -950,22 +961,22 @@ msgstr "" "Der OAuth-Token, der beim Auffrischen der YouTube-Sitzung des aktuell " "angemeldeten Benutzers verwendet wird, soweit vorhanden" -#: data/gsettings/org.gnome.shotwell.gschema.xml:612 +#: data/gsettings/org.gnome.shotwell.gschema.xml:622 msgid "last used import service" msgstr "Zuletzt verwendeter Importdienst" -#: data/gsettings/org.gnome.shotwell.gschema.xml:613 +#: data/gsettings/org.gnome.shotwell.gschema.xml:623 msgid "" "A numeric code representing the last service from which photos were imported" msgstr "" "Ein Zahlencode, der den letzten Dienst darstellt, von dem Fotos importiert " "wurden" -#: data/gsettings/org.gnome.shotwell.gschema.xml:620 +#: data/gsettings/org.gnome.shotwell.gschema.xml:630 msgid "content layout mode" msgstr "Anordnungsmodus" -#: data/gsettings/org.gnome.shotwell.gschema.xml:621 +#: data/gsettings/org.gnome.shotwell.gschema.xml:631 msgid "" "A numeric code that describes how photos are laid out on the page during " "printing" @@ -973,35 +984,35 @@ msgstr "" "Ein Zahlencode, der darstellt, wie Fotos auf dem Medium beim Druck " "angeordnet werden sollen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:626 +#: data/gsettings/org.gnome.shotwell.gschema.xml:636 msgid "content ppi" msgstr "PPI für den Inhalt" -#: data/gsettings/org.gnome.shotwell.gschema.xml:627 +#: data/gsettings/org.gnome.shotwell.gschema.xml:637 msgid "The number of pixels per inch (ppi) sent to the printer during printing" msgstr "Wert für Pixel pro Zoll (ppi), der an den Drucker gesendet werden soll" -#: data/gsettings/org.gnome.shotwell.gschema.xml:632 +#: data/gsettings/org.gnome.shotwell.gschema.xml:642 msgid "content width" msgstr "Breite des Inhalts" -#: data/gsettings/org.gnome.shotwell.gschema.xml:633 +#: data/gsettings/org.gnome.shotwell.gschema.xml:643 msgid "The width of the printed emulsion on the page when printing" msgstr "Die Breite des Druckbereiches auf der Seite" -#: data/gsettings/org.gnome.shotwell.gschema.xml:638 +#: data/gsettings/org.gnome.shotwell.gschema.xml:648 msgid "content height" msgstr "Höhe des Inhalts" -#: data/gsettings/org.gnome.shotwell.gschema.xml:639 +#: data/gsettings/org.gnome.shotwell.gschema.xml:649 msgid "The height of the printed emulsion on the page when printing" msgstr "Die Höhe des Druckbereiches auf der Seite" -#: data/gsettings/org.gnome.shotwell.gschema.xml:644 +#: data/gsettings/org.gnome.shotwell.gschema.xml:654 msgid "content units" msgstr "Einheiten für Inhalte" -#: data/gsettings/org.gnome.shotwell.gschema.xml:645 +#: data/gsettings/org.gnome.shotwell.gschema.xml:655 msgid "" "A numeric code representing unit of measure (inches or centimeters) used " "when printing" @@ -1009,11 +1020,11 @@ msgstr "" "Ein Zahlencode, der die beim Drucken verwendete Maßeinheit (Zoll oder " "Millimeter) darstellt" -#: data/gsettings/org.gnome.shotwell.gschema.xml:650 +#: data/gsettings/org.gnome.shotwell.gschema.xml:660 msgid "images per page code" msgstr "Anzahl der Bilder pro Seite" -#: data/gsettings/org.gnome.shotwell.gschema.xml:651 +#: data/gsettings/org.gnome.shotwell.gschema.xml:661 msgid "" "A numeric code representing the currently selected images per page mode used " "when printing" @@ -1021,22 +1032,22 @@ msgstr "" "Ein Zahlencode, der den aktuell ausgewählten Bilder-pro-Seite-Modus beim " "Drucken darstellt" -#: data/gsettings/org.gnome.shotwell.gschema.xml:656 +#: data/gsettings/org.gnome.shotwell.gschema.xml:666 msgid "size selection" msgstr "Größenauswahl" -#: data/gsettings/org.gnome.shotwell.gschema.xml:657 +#: data/gsettings/org.gnome.shotwell.gschema.xml:667 msgid "" "The index of the current print size in a pre-defined list of standard sizes" msgstr "" "Der Index der aktuellen Druckgröße aus einer vordefinierten Liste von " "Standardgrößen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:662 +#: data/gsettings/org.gnome.shotwell.gschema.xml:672 msgid "match aspect ratio" msgstr "Seitenverhältnis beibehalten" -#: data/gsettings/org.gnome.shotwell.gschema.xml:663 +#: data/gsettings/org.gnome.shotwell.gschema.xml:673 msgid "" "Determines whether custom print sizes must match the aspect ratio of the " "original photo" @@ -1044,174 +1055,176 @@ msgstr "" "Legt fest, ob benutzerdefinierte Druckgrößen dem Seitenverhältnis des " "Originalfotos entsprechen müssen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:668 +#: data/gsettings/org.gnome.shotwell.gschema.xml:678 msgid "print titles" msgstr "Bildtitel drucken" -#: data/gsettings/org.gnome.shotwell.gschema.xml:669 +#: data/gsettings/org.gnome.shotwell.gschema.xml:679 msgid "" "True if the title of a photo should be printed when the photo is printed, " "false otherwise" msgstr "" "Legt fest, ob der Bildtitel beim Drucken mit gedruckt werden soll oder nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:674 +#: data/gsettings/org.gnome.shotwell.gschema.xml:684 msgid "titles font" msgstr "Titelschrift" -#: data/gsettings/org.gnome.shotwell.gschema.xml:675 +#: data/gsettings/org.gnome.shotwell.gschema.xml:685 msgid "The name of the font to use for photo titles when they are printed" msgstr "" "Der Name der Schrift, die beim Drucken für Bildtitel verwendet werden soll" -#: data/gsettings/org.gnome.shotwell.gschema.xml:686 +#: data/gsettings/org.gnome.shotwell.gschema.xml:696 msgid "enable flickr publishing plugin" msgstr "Flickr-Veröffentlichungs-Plugin aktivieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:687 +#: data/gsettings/org.gnome.shotwell.gschema.xml:697 msgid "True if the Flickr publishing plugin is enabled, false otherwise" msgstr "" "Legt fest, ob das Flickr-Veröffentlichungs-Plugin aktiviert ist oder nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:692 +#: data/gsettings/org.gnome.shotwell.gschema.xml:702 +#: data/gsettings/org.gnome.shotwell.gschema.xml:708 msgid "enable Google Photos publishing plugin" msgstr "Google Fotos-Veröffentlichungs-Plugin aktivieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:693 +#: data/gsettings/org.gnome.shotwell.gschema.xml:703 +#: data/gsettings/org.gnome.shotwell.gschema.xml:709 msgid "True if the Google Photos publishing plugin is enabled, false otherwise" msgstr "" "Legt fest, ob das Google Fotos-Veröffentlichungs-Plugin aktiviert ist oder " "nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:698 +#: data/gsettings/org.gnome.shotwell.gschema.xml:714 msgid "enable youtube publishing plugin" msgstr "Youtube-Veröffentlichungs-Plugin aktivieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:699 +#: data/gsettings/org.gnome.shotwell.gschema.xml:715 msgid "True if the YouTube publishing plugin is enabled, false otherwise" msgstr "" "Legt fest, ob das Youtube-Veröffentlichungs-Plugin aktiviert ist oder nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:704 +#: data/gsettings/org.gnome.shotwell.gschema.xml:720 msgid "enable piwigo publishing plugin" msgstr "Piwigo-Veröffentlichungs-Plugin aktivieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:705 +#: data/gsettings/org.gnome.shotwell.gschema.xml:721 msgid "True if the Piwigo publishing plugin is enabled, false otherwise" msgstr "" "Legt fest, ob das Piwigo-Veröffentlichungs-Plugin aktiviert ist oder nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:710 +#: data/gsettings/org.gnome.shotwell.gschema.xml:726 msgid "enable tumblr publishing plugin" msgstr "Tumblr-Veröffentlichungs-Plugin aktivieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:711 +#: data/gsettings/org.gnome.shotwell.gschema.xml:727 msgid "True if the Tumblr publishing plugin is enabled, false otherwise" msgstr "" "Legt fest, ob das Tumblr-Veröffentlichungs-Plugin aktiviert ist oder nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:716 +#: data/gsettings/org.gnome.shotwell.gschema.xml:732 msgid "enable gallery3 publishing plugin" msgstr "Gallery3-Veröffentlichungs-Plugin aktivieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:717 +#: data/gsettings/org.gnome.shotwell.gschema.xml:733 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise" msgstr "" "Legt fest, ob das Gallery3-Veröffentlichungs-Plugin aktiviert ist oder nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:722 +#: data/gsettings/org.gnome.shotwell.gschema.xml:738 msgid "enable slideshow crumble transition" msgstr "Zerfallen-Übergang für Diaschauen aktivieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:723 +#: data/gsettings/org.gnome.shotwell.gschema.xml:739 msgid "" "True if the Crumble slideshow transition plugin is enabled, false otherwise" msgstr "" "Legt fest, ob der Zerfallen-Übergang für Diaschauen aktiviert ist oder nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:728 +#: data/gsettings/org.gnome.shotwell.gschema.xml:744 msgid "enable slideshow fade transition" msgstr "Überblendung für Diaschauen aktivieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:729 +#: data/gsettings/org.gnome.shotwell.gschema.xml:745 msgid "" "True if the Fade slideshow transition plugin is enabled, false otherwise" msgstr "Legt fest, ob die Überbledung für Diaschauen aktiviert ist oder nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:734 +#: data/gsettings/org.gnome.shotwell.gschema.xml:750 msgid "enable slideshow slide transition" msgstr "Gleiten-Übergang für Diaschauen aktivieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:735 +#: data/gsettings/org.gnome.shotwell.gschema.xml:751 msgid "" "True if the Slide slideshow transition plugin is enabled, false otherwise" msgstr "" "Legt fest, ob der Gleiten-Übergang für Diaschauen aktiviert ist oder nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:740 +#: data/gsettings/org.gnome.shotwell.gschema.xml:756 msgid "enable slideshow clock transition" msgstr "Uhr-Übergang für Diaschauen aktivieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:741 +#: data/gsettings/org.gnome.shotwell.gschema.xml:757 msgid "" "True if the Clock slideshow transition plugin is enabled, false otherwise" msgstr "Legt fest, ob der Uhr-Übergang für Diaschauen aktiviert ist oder nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:746 +#: data/gsettings/org.gnome.shotwell.gschema.xml:762 msgid "enable slideshow circle transition" msgstr "Kreis-Übergang für Diaschauen aktivieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:747 +#: data/gsettings/org.gnome.shotwell.gschema.xml:763 msgid "" "True if the Circle slideshow transition plugin is enabled, false otherwise" msgstr "" "Legt fest, ob der Kreis-Übergang für Diaschauen aktiviert ist oder nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:752 +#: data/gsettings/org.gnome.shotwell.gschema.xml:768 msgid "enable slideshow circles transition" msgstr "Kreis-Übergang für Diaschauen aktivieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:753 +#: data/gsettings/org.gnome.shotwell.gschema.xml:769 msgid "" "True if the Circles slideshow transition plugin is enabled, false otherwise" msgstr "" "Legt fest, ob der Kreis-Übergang für Diaschauen aktiviert ist oder nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:758 +#: data/gsettings/org.gnome.shotwell.gschema.xml:774 msgid "enable slideshow blinds transition" msgstr "Vorhang-Übergang für Diaschauen aktivieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:759 +#: data/gsettings/org.gnome.shotwell.gschema.xml:775 msgid "" "True if the Blinds slideshow transition plugin is enabled, false otherwise" msgstr "" "Legt fest, ob der Vorhang-Übergang für Diaschauen aktiviert ist oder nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:764 +#: data/gsettings/org.gnome.shotwell.gschema.xml:780 msgid "enable slideshow squares transition" msgstr "Quadrat-Übergang für Diaschauen aktivieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:765 +#: data/gsettings/org.gnome.shotwell.gschema.xml:781 msgid "" "True if the Squares slideshow transition plugin is enabled, false otherwise" msgstr "" "Legt fest, ob der Quadrat-Übergang für Diaschauen aktiviert ist oder nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:770 +#: data/gsettings/org.gnome.shotwell.gschema.xml:786 msgid "enable slideshow stripes transition" msgstr "Streifen-Übergang für Diaschauen aktivieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:771 +#: data/gsettings/org.gnome.shotwell.gschema.xml:787 msgid "" "True if the Stripes slideshow transition plugin is enabled, false otherwise" msgstr "" "Legt fest, ob der Streifen-Übergang für Diaschauen aktiviert ist oder nicht" -#: data/gsettings/org.gnome.shotwell.gschema.xml:776 +#: data/gsettings/org.gnome.shotwell.gschema.xml:792 msgid "enable slideshow chess transition" msgstr "Schachbrett-Übergang für Diaschauen aktivieren" -#: data/gsettings/org.gnome.shotwell.gschema.xml:777 +#: data/gsettings/org.gnome.shotwell.gschema.xml:793 msgid "" "True if the Chess-Board slideshow transition plugin is enabled, false " "otherwise" @@ -1219,19 +1232,19 @@ msgstr "" "Legt fest, ob der Schachbrettmuster-Übergang für Diaschauen aktiviert ist " "oder nicht" -#: data/org.gnome.Shotwell.appdata.xml.in:8 +#: data/org.gnome.Shotwell.appdata.xml.in:9 #: data/org.gnome.Shotwell.desktop.in:4 data/ui/collection.ui:85 #: data/ui/event.ui:356 data/ui/event.ui:524 data/ui/faces.ui:356 -#: data/ui/media.ui:356 data/ui/photo_context.ui:91 data/ui/photo.ui:351 +#: data/ui/media.ui:356 data/ui/photo_context.ui:91 data/ui/photo.ui:349 #: data/ui/tags.ui:356 src/photos/RawSupport.vala:313 msgid "Shotwell" msgstr "Shotwell" -#: data/org.gnome.Shotwell.appdata.xml.in:9 +#: data/org.gnome.Shotwell.appdata.xml.in:10 msgid "Digital photo organizer" msgstr "Digitaler Foto-Organisator" -#: data/org.gnome.Shotwell.appdata.xml.in:11 +#: data/org.gnome.Shotwell.appdata.xml.in:12 msgid "" "Shotwell is an easy-to-use, fast photo organizer designed for the GNOME " "desktop. It allows you to import photos from your camera or disk, organize " @@ -1249,7 +1262,7 @@ msgstr "" "Fotoeditor verändert Ihre ursprünglichen Aufnahmen nicht, so dass Sie " "wesentlich freier damit experimentieren und Fehler korrigieren können." -#: data/org.gnome.Shotwell.appdata.xml.in:18 +#: data/org.gnome.Shotwell.appdata.xml.in:19 msgid "" "When ready, Shotwell can upload your photos to various web services, such as " "Flickr, Google Photos, and more." @@ -1257,7 +1270,7 @@ msgstr "" "Wenn Shotwell eingerichtet ist, können Sie Ihre Fotos zu verschiedenen " "Webseiten hochladen, wie beispielsweise Flickr, Google Fotos und weitere." -#: data/org.gnome.Shotwell.appdata.xml.in:22 +#: data/org.gnome.Shotwell.appdata.xml.in:23 msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats." msgstr "" "Shotwell unterstützt JPEG, PNG, TIFF und eine Reihe von RAW-Dateiformaten." @@ -1306,99 +1319,99 @@ msgid "Photo Viewer" msgstr "Fotobetrachter" #: data/ui/collection.ui:8 data/ui/direct_context.ui:7 data/ui/direct.ui:136 -#: data/ui/event.ui:447 data/ui/photo_context.ui:6 data/ui/photo.ui:227 +#: data/ui/event.ui:447 data/ui/photo_context.ui:6 data/ui/photo.ui:225 #: src/CollectionPage.vala:119 src/Resources.vala:153 msgid "_Enhance" msgstr "_Verbessern" #: data/ui/collection.ui:13 data/ui/direct_context.ui:12 data/ui/direct.ui:163 -#: data/ui/event.ui:452 data/ui/photo_context.ui:11 data/ui/photo.ui:254 +#: data/ui/event.ui:452 data/ui/photo_context.ui:11 data/ui/photo.ui:252 #: src/CollectionPage.vala:120 src/Resources.vala:181 msgid "Re_vert to Original" msgstr "_Zurück zum Original" #: data/ui/collection.ui:19 data/ui/event.ui:407 data/ui/event.ui:458 -#: data/ui/faces.ui:390 data/ui/media.ui:390 data/ui/photo.ui:379 +#: data/ui/faces.ui:390 data/ui/media.ui:390 data/ui/photo.ui:377 #: data/ui/tags.ui:390 src/Resources.vala:279 msgid "Add _Tags…" msgstr "Stichwor_te hinzufügen …" #: data/ui/collection.ui:24 data/ui/event.ui:412 data/ui/event.ui:463 #: data/ui/faces.ui:395 data/ui/media.ui:395 data/ui/photo_context.ui:22 -#: data/ui/photo.ui:384 data/ui/tags.ui:395 src/Resources.vala:351 +#: data/ui/photo.ui:382 data/ui/tags.ui:395 src/Resources.vala:351 msgid "Modif_y Tags…" msgstr "Stichworte _ändern …" #: data/ui/collection.ui:33 data/ui/event.ui:281 data/ui/event.ui:472 #: data/ui/faces.ui:281 data/ui/media.ui:281 data/ui/photo_context.ui:30 -#: data/ui/photo.ui:272 data/ui/tags.ui:281 +#: data/ui/photo.ui:270 data/ui/tags.ui:281 msgid "Toggle _Flag" msgstr "Markierung _umschalten" #: data/ui/collection.ui:39 data/ui/event.ui:286 data/ui/event.ui:478 #: data/ui/faces.ui:286 data/ui/media.ui:286 data/ui/photo_context.ui:35 -#: data/ui/photo.ui:277 data/ui/tags.ui:286 src/Resources.vala:213 +#: data/ui/photo.ui:275 data/ui/tags.ui:286 src/Resources.vala:213 msgid "_Set Rating" msgstr "_Bewerten" #: data/ui/collection.ui:62 data/ui/event.ui:314 data/ui/event.ui:501 #: data/ui/faces.ui:314 data/ui/media.ui:314 data/ui/photo_context.ui:63 -#: data/ui/photo.ui:305 data/ui/tags.ui:314 src/Resources.vala:223 +#: data/ui/photo.ui:303 data/ui/tags.ui:314 src/Resources.vala:223 msgid "_Unrated" msgstr "_Nicht bewertet" #: data/ui/collection.ui:66 data/ui/event.ui:319 data/ui/event.ui:505 #: data/ui/faces.ui:319 data/ui/media.ui:319 data/ui/photo_context.ui:68 -#: data/ui/photo.ui:310 data/ui/tags.ui:319 src/Resources.vala:229 +#: data/ui/photo.ui:308 data/ui/tags.ui:319 src/Resources.vala:229 msgid "_Rejected" msgstr "A_bgelehnt" #: data/ui/collection.ui:72 data/ui/event.ui:326 data/ui/event.ui:511 #: data/ui/faces.ui:326 data/ui/media.ui:326 data/ui/photo_context.ui:75 -#: data/ui/photo.ui:317 data/ui/tags.ui:326 src/Resources.vala:217 +#: data/ui/photo.ui:315 data/ui/tags.ui:326 src/Resources.vala:217 msgid "_Increase" msgstr "_Aufwerten" #: data/ui/collection.ui:76 data/ui/event.ui:331 data/ui/event.ui:515 #: data/ui/faces.ui:331 data/ui/media.ui:331 data/ui/photo_context.ui:80 -#: data/ui/photo.ui:322 data/ui/tags.ui:331 src/Resources.vala:220 +#: data/ui/photo.ui:320 data/ui/tags.ui:331 src/Resources.vala:220 msgid "_Decrease" msgstr "A_bwerten" #: data/ui/collection.ui:82 data/ui/event.ui:353 data/ui/event.ui:521 #: data/ui/faces.ui:353 data/ui/media.ui:353 data/ui/photo_context.ui:88 -#: data/ui/photo.ui:348 data/ui/tags.ui:353 +#: data/ui/photo.ui:346 data/ui/tags.ui:353 msgid "_Developer" msgstr "_Entwickler" #: data/ui/collection.ui:90 data/ui/event.ui:361 data/ui/event.ui:529 #: data/ui/faces.ui:361 data/ui/media.ui:361 data/ui/photo_context.ui:96 -#: data/ui/photo.ui:356 data/ui/tags.ui:361 src/camera/CameraBranch.vala:99 +#: data/ui/photo.ui:354 data/ui/tags.ui:361 src/camera/CameraBranch.vala:99 #: src/camera/ImportPage.vala:709 src/photos/RawSupport.vala:316 msgid "Camera" msgstr "Kamera" #: data/ui/collection.ui:98 data/ui/event.ui:340 data/ui/event.ui:537 #: data/ui/faces.ui:340 data/ui/media.ui:340 data/ui/photo_context.ui:105 -#: data/ui/photo.ui:331 data/ui/tags.ui:340 src/Resources.vala:265 +#: data/ui/photo.ui:329 data/ui/tags.ui:340 src/Resources.vala:265 msgid "Edit _Title…" msgstr "_Titel bearbeiten …" #: data/ui/collection.ui:103 data/ui/events_directory.ui:144 #: data/ui/events_directory.ui:186 data/ui/event.ui:345 data/ui/event.ui:398 #: data/ui/event.ui:542 data/ui/faces.ui:345 data/ui/media.ui:345 -#: data/ui/photo_context.ui:110 data/ui/photo.ui:336 data/ui/tags.ui:345 +#: data/ui/photo_context.ui:110 data/ui/photo.ui:334 data/ui/tags.ui:345 #: src/Resources.vala:269 msgid "Edit _Comment…" msgstr "_Kommentar bearbeiten …" #: data/ui/collection.ui:108 data/ui/event.ui:547 data/ui/photo_context.ui:115 -#: data/ui/photo.ui:365 src/CollectionPage.vala:143 src/Resources.vala:286 +#: data/ui/photo.ui:363 src/CollectionPage.vala:143 src/Resources.vala:286 msgid "Open With E_xternal Editor" msgstr "Mit e_xternem Editor öffnen" #: data/ui/collection.ui:113 data/ui/event.ui:552 data/ui/photo_context.ui:120 -#: data/ui/photo.ui:370 src/CollectionPage.vala:146 src/Resources.vala:288 +#: data/ui/photo.ui:368 src/CollectionPage.vala:146 src/Resources.vala:288 msgid "Open With RA_W Editor" msgstr "Mit RA_W-Editor öffnen" @@ -1473,8 +1486,10 @@ msgstr "Suchen" msgid "_File" msgstr "_Datei" +#. Check if we can write the target format +#. TODO: Check if we can actually write to the file #: data/ui/direct.ui:8 data/ui/textentrydialog.ui:33 -#: src/direct/DirectPhotoPage.vala:323 src/Resources.vala:142 +#: src/direct/DirectPhotoPage.vala:327 src/Resources.vala:142 msgid "_Save" msgstr "_Speichern" @@ -1554,52 +1569,52 @@ msgstr "_Foto" msgid "_Previous Photo" msgstr "_Voriges Foto" -#: data/ui/direct.ui:106 data/ui/photo.ui:197 +#: data/ui/direct.ui:106 data/ui/photo.ui:196 msgid "_Next Photo" msgstr "_Nächstes Foto" -#: data/ui/direct.ui:113 data/ui/photo.ui:204 src/CollectionPage.vala:110 +#: data/ui/direct.ui:113 data/ui/photo.ui:202 src/CollectionPage.vala:110 #: src/Resources.vala:106 msgid "Rotate _Right" msgstr "Nach _rechts drehen" -#: data/ui/direct.ui:118 data/ui/photo.ui:209 src/CollectionPage.vala:113 +#: data/ui/direct.ui:118 data/ui/photo.ui:207 src/CollectionPage.vala:113 #: src/Resources.vala:111 msgid "Rotate _Left" msgstr "Nach _links drehen" -#: data/ui/direct.ui:123 data/ui/photo.ui:214 src/CollectionPage.vala:116 +#: data/ui/direct.ui:123 data/ui/photo.ui:212 src/CollectionPage.vala:116 #: src/Resources.vala:116 msgid "Flip Hori_zontally" msgstr "Hori_zontal spiegeln" -#: data/ui/direct.ui:127 data/ui/photo.ui:218 src/CollectionPage.vala:117 +#: data/ui/direct.ui:127 data/ui/photo.ui:216 src/CollectionPage.vala:117 #: src/Resources.vala:119 msgid "Flip Verti_cally" msgstr "Verti_kal spiegeln" -#: data/ui/direct.ui:133 data/ui/photo.ui:224 +#: data/ui/direct.ui:133 data/ui/photo.ui:222 msgid "T_ools" msgstr "_Werkzeuge" -#: data/ui/direct.ui:141 data/ui/photo.ui:232 src/Resources.vala:165 +#: data/ui/direct.ui:141 data/ui/photo.ui:230 src/Resources.vala:165 msgid "_Crop" msgstr "Zus_chneiden" -#: data/ui/direct.ui:146 data/ui/photo.ui:237 +#: data/ui/direct.ui:146 data/ui/photo.ui:235 #: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:169 msgid "_Straighten" msgstr "Au_srichten" -#: data/ui/direct.ui:151 data/ui/photo.ui:242 src/Resources.vala:173 +#: data/ui/direct.ui:151 data/ui/photo.ui:240 src/Resources.vala:173 msgid "_Red-eye" msgstr "_Rote Augen entfernen" -#: data/ui/direct.ui:156 data/ui/photo.ui:247 src/Resources.vala:177 +#: data/ui/direct.ui:156 data/ui/photo.ui:245 src/Resources.vala:177 msgid "_Adjust" msgstr "_Anpassen" -#: data/ui/direct.ui:169 data/ui/photo.ui:341 src/Resources.vala:276 +#: data/ui/direct.ui:169 data/ui/photo.ui:339 src/Resources.vala:276 msgid "_Adjust Date and Time…" msgstr "Datum und Zeit _anpassen …" @@ -1608,7 +1623,7 @@ msgstr "Datum und Zeit _anpassen …" #: data/ui/faces.ui:430 data/ui/faces.ui:433 data/ui/import_queue.ui:65 #: data/ui/import_queue.ui:68 data/ui/import.ui:183 data/ui/import.ui:186 #: data/ui/media.ui:403 data/ui/media.ui:406 data/ui/offline.ui:180 -#: data/ui/offline.ui:183 data/ui/photo.ui:391 data/ui/photo.ui:394 +#: data/ui/offline.ui:183 data/ui/photo.ui:389 data/ui/photo.ui:392 #: data/ui/tags.ui:422 data/ui/tags.ui:425 data/ui/trash.ui:189 #: data/ui/trash.ui:192 src/Resources.vala:129 msgid "_Help" @@ -1616,21 +1631,21 @@ msgstr "_Hilfe" #: data/ui/direct.ui:184 data/ui/events_directory.ui:158 data/ui/event.ui:428 #: data/ui/faces.ui:438 data/ui/import_queue.ui:73 data/ui/import.ui:191 -#: data/ui/media.ui:411 data/ui/offline.ui:188 data/ui/photo.ui:399 +#: data/ui/media.ui:411 data/ui/offline.ui:188 data/ui/photo.ui:397 #: data/ui/tags.ui:430 data/ui/trash.ui:197 msgid "_Frequently Asked Questions" msgstr "Oft gestellte _Fragen" #: data/ui/direct.ui:188 data/ui/events_directory.ui:162 data/ui/event.ui:432 #: data/ui/faces.ui:442 data/ui/import_queue.ui:77 data/ui/import.ui:195 -#: data/ui/media.ui:415 data/ui/offline.ui:192 data/ui/photo.ui:403 +#: data/ui/media.ui:415 data/ui/offline.ui:192 data/ui/photo.ui:401 #: data/ui/tags.ui:434 data/ui/trash.ui:201 msgid "_Report a Problem…" msgstr "_Ein Problem melden …" #: data/ui/direct.ui:194 data/ui/events_directory.ui:168 data/ui/event.ui:438 #: data/ui/faces.ui:448 data/ui/import_queue.ui:83 data/ui/import.ui:201 -#: data/ui/media.ui:421 data/ui/offline.ui:198 data/ui/photo.ui:409 +#: data/ui/media.ui:421 data/ui/offline.ui:198 data/ui/photo.ui:407 #: data/ui/tags.ui:440 data/ui/trash.ui:207 src/Resources.vala:122 msgid "_About" msgstr "_Info" @@ -1771,7 +1786,7 @@ msgstr "_Titel" #: data/ui/event.ui:139 data/ui/event.ui:404 data/ui/faces.ui:139 #: data/ui/faces.ui:387 data/ui/media.ui:139 data/ui/media.ui:387 -#: data/ui/photo.ui:376 data/ui/tags.ui:139 data/ui/tags.ui:387 +#: data/ui/photo.ui:374 data/ui/tags.ui:139 data/ui/tags.ui:387 msgid "Ta_gs" msgstr "S_tichworte" @@ -1882,11 +1897,11 @@ msgid "_Log in" msgstr "_Anmelden" #: data/ui/multitextentrydialog.ui:25 data/ui/slideshow_settings.ui:38 -#: data/ui/textentrydialog.ui:19 src/AppWindow.vala:513 src/AppWindow.vala:534 +#: data/ui/textentrydialog.ui:19 src/AppWindow.vala:517 src/AppWindow.vala:538 #: src/data_imports/DataImportsUI.vala:302 #: src/data_imports/DataImportsUI.vala:420 src/Dialogs.vala:20 #: src/Dialogs.vala:28 src/Dialogs.vala:56 src/Dialogs.vala:760 -#: src/Dialogs.vala:783 src/Exporter.vala:348 src/ProfileBrowser.vala:68 +#: src/Dialogs.vala:783 src/Exporter.vala:349 src/ProfileBrowser.vala:68 #: src/ProfileBrowser.vala:100 src/publishing/PublishingUI.vala:174 #: src/publishing/PublishingUI.vala:403 src/Resources.vala:124 msgid "_Cancel" @@ -1915,11 +1930,11 @@ msgstr "Senden a_n …" msgid "S_lideshow" msgstr "_Diaschau" -#: data/ui/photo.ui:260 src/CollectionPage.vala:122 src/Resources.vala:157 +#: data/ui/photo.ui:258 src/CollectionPage.vala:122 src/Resources.vala:157 msgid "_Copy Color Adjustments" msgstr "Farbanpassungen _kopieren" -#: data/ui/photo.ui:265 src/CollectionPage.vala:125 src/Resources.vala:161 +#: data/ui/photo.ui:263 src/CollectionPage.vala:125 src/Resources.vala:161 msgid "_Paste Color Adjustments" msgstr "Farbanpassungen _einfügen" @@ -2088,7 +2103,7 @@ msgid "Search" msgstr "Suchen" #: data/ui/saved_search_dialog.ui:26 src/ProfileBrowser.vala:20 -#: src/ProfileBrowser.vala:217 +#: src/ProfileBrowser.vala:221 msgid "Cancel" msgstr "Abbrechen" @@ -2175,7 +2190,7 @@ msgstr "" msgid "New _Tag…" msgstr "Neues S_tichwort …" -#: data/ui/slideshow_settings.ui:21 src/SlideshowPage.vala:159 +#: data/ui/slideshow_settings.ui:21 src/SlideshowPage.vala:174 msgid "Settings" msgstr "Einstellungen" @@ -2203,7 +2218,7 @@ msgstr "Die Dauer (in Sekunden) jedes Übergangs zwischen Fotos" msgid "Show t_itle" msgstr "T_itel anzeigen" -#: data/ui/slideshow_settings.ui:221 data/ui/slideshow_settings.ui:232 +#: data/ui/slideshow_settings.ui:237 data/ui/slideshow_settings.ui:248 msgid "seconds" msgstr "Sekunden" @@ -2394,7 +2409,7 @@ msgstr "UI konnte nicht geladen werden: %s" msgid "Visit the Shotwell home page" msgstr "Die Shotwell-Webseite besuchen" -#: plugins/common/Resources.vala:31 src/AppWindow.vala:588 +#: plugins/common/Resources.vala:31 src/AppWindow.vala:592 #: src/plugins/SpitInterfaces.vala:177 msgid "translator-credits" msgstr "" @@ -2500,7 +2515,7 @@ msgstr "A_bmelden" #: plugins/shotwell-publishing/google_photos_publishing_options_pane.ui:195 #: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:122 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:94 -#: src/CollectionPage.vala:82 src/PhotoPage.vala:2488 +#: src/CollectionPage.vala:82 src/PhotoPage.vala:2495 msgid "_Publish" msgstr "_Veröffentlichen" @@ -2948,39 +2963,39 @@ msgstr "Fehler beim Erstellen des Datenordners %s: %s" msgid "Pictures" msgstr "Bilder" -#: src/AppDirs.vala:205 +#: src/AppDirs.vala:211 #, c-format msgid "Unable to create temporary directory %s: %s" msgstr "Fehler beim Erstellen des Ordners %s für temporäre Dateien: %s" -#: src/AppDirs.vala:222 src/AppDirs.vala:253 +#: src/AppDirs.vala:229 src/AppDirs.vala:260 #, c-format msgid "Unable to create data subdirectory %s: %s" msgstr "Fehler beim Erstellen des Unterordners %s für Daten: %s" -#: src/AppDirs.vala:235 +#: src/AppDirs.vala:242 #, c-format msgid "Could not make directory %s writable" msgstr "Ordner %s konnte nicht schreibbar gesetzt werden" -#: src/AppDirs.vala:238 +#: src/AppDirs.vala:245 #, c-format msgid "Could not make directory %s writable: %s" msgstr "Ordner %s konnte nicht schreibbar gesetzt werden: %s" -#: src/AppWindow.vala:47 +#: src/AppWindow.vala:52 msgid "Pin Toolbar" msgstr "Werkzeugleiste fixieren" -#: src/AppWindow.vala:48 +#: src/AppWindow.vala:53 msgid "Pin the toolbar open" msgstr "Werkzeugleiste immer geöffnet" -#: src/AppWindow.vala:53 +#: src/AppWindow.vala:58 msgid "Leave fullscreen" msgstr "Vollbild verlassen" -#: src/AppWindow.vala:560 +#: src/AppWindow.vala:564 #, c-format msgid "" "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot " @@ -2993,21 +3008,21 @@ msgstr "" "\n" "%s" -#: src/AppWindow.vala:585 +#: src/AppWindow.vala:589 msgid "Visit the Shotwell web site" msgstr "Besuchen Sie die Shotwell-Internetseite" -#: src/AppWindow.vala:598 +#: src/AppWindow.vala:602 #, c-format msgid "Unable to display help: %s" msgstr "Die Hilfe kann nicht angezeigt werden: %s" -#: src/AppWindow.vala:606 +#: src/AppWindow.vala:610 #, c-format msgid "Unable to navigate to bug database: %s" msgstr "Zur Datenbank von Fehlerberichten kann nicht gewechselt werden: %s" -#: src/AppWindow.vala:614 +#: src/AppWindow.vala:618 #, c-format msgid "Unable to display FAQ: %s" msgstr "Die oft gestellten Fragen können nicht angezeigt werden: %s" @@ -3175,53 +3190,53 @@ msgstr "Import wird gestartet, bitte warten …" msgid "Fetching photo information" msgstr "Foto-Informationen werden abgerufen" -#: src/camera/ImportPage.vala:1547 +#: src/camera/ImportPage.vala:1544 #, c-format msgid "Fetching preview for %s" msgstr "Vorschaubild für %s wird abgerufen" -#: src/camera/ImportPage.vala:1656 +#: src/camera/ImportPage.vala:1653 #, c-format msgid "Unable to lock camera: %s" msgstr "Kamera kann nicht reserviert werden: %s" -#: src/camera/ImportPage.vala:1741 +#: src/camera/ImportPage.vala:1738 #, c-format msgid "Delete this photo from camera?" msgid_plural "Delete these %d photos from camera?" msgstr[0] "Soll dieses Foto von der Kamera gelöscht werden?" msgstr[1] "Sollen diese %d Fotos von der Kamera gelöscht werden?" -#: src/camera/ImportPage.vala:1744 +#: src/camera/ImportPage.vala:1741 #, c-format msgid "Delete this video from camera?" msgid_plural "Delete these %d videos from camera?" msgstr[0] "Soll dieses Video von der Kamera gelöscht werden?" msgstr[1] "Sollen diese %d Videos von der Kamera gelöscht werden?" -#: src/camera/ImportPage.vala:1747 +#: src/camera/ImportPage.vala:1744 #, c-format msgid "Delete this photo/video from camera?" msgid_plural "Delete these %d photos/videos from camera?" msgstr[0] "Soll dieses Foto/Video von der Kamera gelöscht werden?" msgstr[1] "Sollen diese %d Fotos/Videos von der Kamera gelöscht werden?" -#: src/camera/ImportPage.vala:1750 +#: src/camera/ImportPage.vala:1747 #, c-format msgid "Delete these files from camera?" msgid_plural "Delete these %d files from camera?" msgstr[0] "Sollen diese Dateien von der Kamera gelöscht werden?" msgstr[1] "Sollen diese %d Dateien von der Kamera gelöscht werden?" -#: src/camera/ImportPage.vala:1758 src/Dialogs.vala:727 +#: src/camera/ImportPage.vala:1755 src/Dialogs.vala:727 msgid "_Keep" msgstr "_Behalten" -#: src/camera/ImportPage.vala:1777 +#: src/camera/ImportPage.vala:1774 msgid "Removing photos/videos from camera" msgstr "Fotos/Videos werden von der Kamera entfernt" -#: src/camera/ImportPage.vala:1781 +#: src/camera/ImportPage.vala:1778 #, c-format msgid "Unable to delete %d photo/video from the camera due to errors." msgid_plural "Unable to delete %d photos/videos from the camera due to errors." @@ -3238,13 +3253,13 @@ msgstr "Keine Fotos/Videos" msgid "No photos/videos found which match the current filter" msgstr "Keine Fotos oder Videos gefunden, die auf den aktuellen Filter passen" -#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85 -#: src/PhotoPage.vala:2483 src/Resources.vala:137 +#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:86 +#: src/PhotoPage.vala:2490 src/Resources.vala:137 msgid "_Print" msgstr "_Drucken" -#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90 -#: src/PhotoPage.vala:2493 src/Resources.vala:187 +#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:91 +#: src/PhotoPage.vala:2500 src/Resources.vala:187 msgid "Set as _Desktop Background" msgstr "Als Hintergrund_bild festlegen" @@ -3264,39 +3279,39 @@ msgstr "Datum und Zeit anpassen …" msgid "_Play" msgstr "_Wiedergabe" -#: src/CollectionPage.vala:410 +#: src/CollectionPage.vala:413 msgid "Export Photo/Video" msgid_plural "Export Photos/Videos" msgstr[0] "Foto/Video exportieren" msgstr[1] "Fotos/Videos exportieren" -#: src/CollectionPage.vala:412 +#: src/CollectionPage.vala:415 msgid "Export Photo" msgid_plural "Export Photos" msgstr[0] "Foto exportieren" msgstr[1] "Fotos exportieren" -#: src/CollectionPage.vala:499 src/CollectionPage.vala:515 +#: src/CollectionPage.vala:502 src/CollectionPage.vala:518 msgid "Rotating" msgstr "Drehen läuft" -#: src/CollectionPage.vala:499 src/CollectionPage.vala:515 +#: src/CollectionPage.vala:502 src/CollectionPage.vala:518 msgid "Undoing Rotate" msgstr "Drehen wird zurück genommen" -#: src/CollectionPage.vala:524 +#: src/CollectionPage.vala:527 msgid "Flipping Horizontally" msgstr "Horizontal spiegeln" -#: src/CollectionPage.vala:525 +#: src/CollectionPage.vala:528 msgid "Undoing Flip Horizontally" msgstr "»Horizontal spiegeln« wird zurück genommen" -#: src/CollectionPage.vala:534 +#: src/CollectionPage.vala:537 msgid "Flipping Vertically" msgstr "Vertikal spiegeln" -#: src/CollectionPage.vala:535 +#: src/CollectionPage.vala:538 msgid "Undoing Flip Vertically" msgstr "»Vertikal spiegeln« wird zurück genommen" @@ -3822,7 +3837,7 @@ msgstr[1] "" msgid "Export Video" msgstr "Video exportieren" -#: src/Dialogs.vala:70 src/PhotoPage.vala:3018 +#: src/Dialogs.vala:70 src/PhotoPage.vala:3025 msgctxt "Dialog Title" msgid "Export Photo" msgstr "Foto exportieren" @@ -4357,13 +4372,13 @@ msgstr[1] "" "\n" "und %d andere." -#: src/Dialogs.vala:831 src/Dialogs.vala:868 +#: src/Dialogs.vala:835 src/Dialogs.vala:872 msgid "Tags (separated by commas):" msgstr "Stichworte (getrennt durch Kommata):" #. This function is used to determine whether or not files should be copied or linked when imported. #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel. -#: src/Dialogs.vala:946 +#: src/Dialogs.vala:950 msgid "" "Shotwell can copy the photos into your library folder or it can import them " "without copying." @@ -4371,29 +4386,29 @@ msgstr "" "Shotwell kann die Fotos aus dem Ordner in die Bibliothek kopieren oder sie " "können verknüpft werden, ohne sie zu kopieren." -#: src/Dialogs.vala:951 +#: src/Dialogs.vala:955 msgid "Co_py Photos" msgstr "Fotos ko_pieren" -#: src/Dialogs.vala:952 +#: src/Dialogs.vala:956 msgid "_Import in Place" msgstr "_Import durch Verknüpfen" -#: src/Dialogs.vala:953 +#: src/Dialogs.vala:957 msgid "Import to Library" msgstr "In Bibliothek importieren" -#: src/Dialogs.vala:963 +#: src/Dialogs.vala:967 msgid "Remove From Library" msgstr "Aus Bibliothek entfernen" -#: src/Dialogs.vala:964 +#: src/Dialogs.vala:968 msgid "Removing Photo From Library" msgid_plural "Removing Photos From Library" msgstr[0] "Foto aus der Bibliothek entfernen" msgstr[1] "Fotos aus der Bibliothek entfernen" -#: src/Dialogs.vala:978 +#: src/Dialogs.vala:982 #, c-format msgid "" "This will remove the photo/video from your Shotwell library. Would you also " @@ -4416,7 +4431,7 @@ msgstr[1] "" "\n" "Diese Aktion kann nicht rückgängig gemacht werden." -#: src/Dialogs.vala:982 +#: src/Dialogs.vala:986 #, c-format msgid "" "This will remove the video from your Shotwell library. Would you also like " @@ -4439,7 +4454,7 @@ msgstr[1] "" "\n" "Diese Aktion kann nicht rückgängig gemacht werden." -#: src/Dialogs.vala:986 +#: src/Dialogs.vala:990 #, c-format msgid "" "This will remove the photo from your Shotwell library. Would you also like " @@ -4462,7 +4477,7 @@ msgstr[1] "" "\n" "Diese Aktion kann nicht rückgängig gemacht werden." -#: src/Dialogs.vala:1018 +#: src/Dialogs.vala:1022 #, c-format msgid "" "The photo or video cannot be moved to your desktop trash. Delete this file?" @@ -4476,7 +4491,7 @@ msgstr[1] "" "löschen?" #. Alert the user that the files were not removed. -#: src/Dialogs.vala:1035 +#: src/Dialogs.vala:1039 #, c-format msgid "The photo or video cannot be deleted." msgid_plural "%d photos/videos cannot be deleted." @@ -4537,17 +4552,17 @@ msgstr "Breite" msgid "Height" msgstr "Höhe" -#: src/direct/DirectPhotoPage.vala:99 +#: src/direct/DirectPhotoPage.vala:100 #, c-format msgid "%s does not exist." msgstr "%s existiert nicht." -#: src/direct/DirectPhotoPage.vala:101 +#: src/direct/DirectPhotoPage.vala:102 #, c-format msgid "%s is not a file." msgstr "%s ist keine Datei." -#: src/direct/DirectPhotoPage.vala:103 +#: src/direct/DirectPhotoPage.vala:104 #, c-format msgid "" "%s does not support the file format of\n" @@ -4556,40 +4571,48 @@ msgstr "" "%s unterstützt das Dateiformat von\n" "%s nicht." -#: src/direct/DirectPhotoPage.vala:120 +#: src/direct/DirectPhotoPage.vala:121 #, c-format msgid "Unable open photo %s. Sorry." msgstr "Das Foto %s kann nicht geöffnet werden. Entschuldigung." -#: src/direct/DirectPhotoPage.vala:323 +#: src/direct/DirectPhotoPage.vala:327 msgid "_Save a Copy" msgstr "Eine Kopie _speichern" -#: src/direct/DirectPhotoPage.vala:326 +#: src/direct/DirectPhotoPage.vala:330 #, c-format msgid "Lose changes to %s?" msgstr "Änderungen an %s verwerfen?" -#: src/direct/DirectPhotoPage.vala:327 +#: src/direct/DirectPhotoPage.vala:331 msgid "Close _without Saving" msgstr "Schließen _ohne zu speichern" -#: src/direct/DirectPhotoPage.vala:360 +#: src/direct/DirectPhotoPage.vala:367 #, c-format msgid "Error while saving to %s: %s" msgstr "Fehler beim Speichern als %s: %s" -#: src/direct/DirectPhotoPage.vala:390 src/direct/DirectPhotoPage.vala:411 +#: src/direct/DirectPhotoPage.vala:399 src/direct/DirectPhotoPage.vala:425 msgid "Save As" msgstr "Speichern unter" +#: src/direct/DirectPhotoPage.vala:414 +msgid "Supported image formats" +msgstr "Unterstützte Bildformate" + +#: src/direct/DirectPhotoPage.vala:423 +msgid "All files" +msgstr "Alle Dateien" + #. verify this is a directory #: src/DirectoryMonitor.vala:891 #, c-format msgid "Unable to monitor %s: Not a directory (%s)" msgstr "%s kann nicht überwacht werden, es ist kein Ordner (%s)" -#: src/DragAndDropHandler.vala:161 +#: src/DragAndDropHandler.vala:165 msgid "Photos cannot be exported to this directory." msgstr "Fotos können nicht in diesen Ordner exportiert werden." @@ -4831,41 +4854,41 @@ msgstr "Nicht datiert" msgid "Event %s" msgstr "Ereignis %s" -#: src/Exporter.vala:236 src/Exporter.vala:291 +#: src/Exporter.vala:237 src/Exporter.vala:292 #, c-format msgid "Unable to generate a temporary file for %s: %s" msgstr "Fehler beim Erstellen einer temporären Datei für %s: %s" -#: src/Exporter.vala:328 +#: src/Exporter.vala:329 msgid "Exporting" msgstr "Wird exportiert" -#: src/Exporter.vala:346 +#: src/Exporter.vala:347 #, c-format msgid "File %s already exists. Replace?" msgstr "Die Datei %s existiert bereits. Soll sie überschrieben werden?" -#: src/Exporter.vala:348 +#: src/Exporter.vala:349 msgid "_Skip" msgstr "Ü_berspringen" -#: src/Exporter.vala:348 +#: src/Exporter.vala:349 msgid "Rename" msgstr "Umbenennen" -#: src/Exporter.vala:348 +#: src/Exporter.vala:349 msgid "Rename All" msgstr "Alle umbenennen" -#: src/Exporter.vala:348 +#: src/Exporter.vala:349 msgid "_Replace" msgstr "E_rsetzen" -#: src/Exporter.vala:348 +#: src/Exporter.vala:349 msgid "Replace _All" msgstr "_Alle ersetzen" -#: src/Exporter.vala:348 +#: src/Exporter.vala:349 msgid "Export" msgstr "Exportieren" @@ -5152,11 +5175,11 @@ msgstr "" "Rufen Sie »%s --help« auf, um eine vollständige Liste von möglichen " "Befehlszeilenoptionen zu erhalten.\n" -#: src/main.vala:410 +#: src/main.vala:412 msgid "Choose Shotwell's profile" msgstr "Shotwells Profil wählen" -#: src/main.vala:431 +#: src/main.vala:438 #, c-format msgid "Profile %s does not exist. Did you mean to pass --create as well?" msgstr "Profil %s existiert nicht. Wollten Sie auch »--create« übergeben?" @@ -5189,31 +5212,31 @@ msgstr "" "%s" #. previous button -#: src/PhotoPage.vala:546 +#: src/PhotoPage.vala:553 msgid "Previous photo" msgstr "Voriges Foto" #. next button -#: src/PhotoPage.vala:552 +#: src/PhotoPage.vala:559 msgid "Next photo" msgstr "Nächstes Foto" -#: src/PhotoPage.vala:1860 +#: src/PhotoPage.vala:1867 #, c-format msgid "Photo source file missing: %s" msgstr "Foto-Quelldatei fehlt: %s" -#: src/PhotoPage.vala:2893 +#: src/PhotoPage.vala:2900 msgctxt "Dialog Title" msgid "Remove From Library" msgstr "Aus Bibliothek entfernen" -#: src/PhotoPage.vala:2894 +#: src/PhotoPage.vala:2901 msgctxt "Dialog Title" msgid "Removing Photo From Library" msgstr "Foto wird aus Bibliothek entfernt" -#: src/PhotoPage.vala:3038 +#: src/PhotoPage.vala:3045 #, c-format msgid "Unable to export %s: %s" msgstr "%s kann nicht exportiert werden: %s" @@ -5276,7 +5299,8 @@ msgstr "TIFF" msgid "WebP" msgstr "WebP" -#: src/Photo.vala:3811 +#. TRANSLATORS: "modified" here is part of a file name that was changed with another image tool outside of Shotwell. Note that there are potential issues with UTF-8 characters +#: src/Photo.vala:3812 msgid "modified" msgstr "verändert" @@ -5373,7 +5397,7 @@ msgstr "Bibliothek-Ordner" msgid "Choose Library Folder" msgstr "Bibliothek-Ordner wählen" -#: src/ProfileBrowser.vala:80 src/ProfileBrowser.vala:187 +#: src/ProfileBrowser.vala:80 src/ProfileBrowser.vala:189 msgid "Data Folder" msgstr "Daten-Ordner" @@ -5385,20 +5409,20 @@ msgstr "Daten-Ordner wählen" msgid "This is the currently active profile" msgstr "Dies ist das aktuell aktive Profil" -#: src/ProfileBrowser.vala:199 +#: src/ProfileBrowser.vala:203 msgid "Remove Profile" msgstr "Profil entfernen" -#: src/ProfileBrowser.vala:201 +#: src/ProfileBrowser.vala:205 msgid "Remove this profile" msgstr "Dieses Profil entfernen" -#: src/ProfileBrowser.vala:213 +#: src/ProfileBrowser.vala:217 #, c-format msgid "Remove profile “%s”" msgstr "Profil »%s« entfernen" -#: src/ProfileBrowser.vala:214 +#: src/ProfileBrowser.vala:218 msgid "" "None of the options will remove any of the images associated with this " "profile" @@ -5406,7 +5430,7 @@ msgstr "" "Keine der Optionen wird irgendeines der mit diesem Profil verbundenen Bilder " "entfernen" -#: src/ProfileBrowser.vala:215 +#: src/ProfileBrowser.vala:219 #, c-format msgid "" "<b><span size=\"larger\">%s</span></b>\n" @@ -5415,11 +5439,11 @@ msgstr "" "<b><span size=\"larger\">%s</span></b>\n" "<span weight=\"light\">%s</span>" -#: src/ProfileBrowser.vala:217 +#: src/ProfileBrowser.vala:221 msgid "Remove profile and files" msgstr "Profil und Dateien entfernen" -#: src/ProfileBrowser.vala:217 +#: src/ProfileBrowser.vala:221 msgid "Remove profile only" msgstr "Nur Profil entfernen" @@ -6226,7 +6250,7 @@ msgctxt "MultimonthFormat" msgid "%a %b %d, %Y" msgstr "%a %d. %b, %Y" -#: src/Screensaver.vala:18 src/SlideshowPage.vala:117 +#: src/Screensaver.vala:18 src/SlideshowPage.vala:128 msgid "Slideshow" msgstr "Diaschau" @@ -6455,44 +6479,44 @@ msgstr "" #. Set up toolbar #. add toolbar buttons -#: src/SlideshowPage.vala:136 +#: src/SlideshowPage.vala:151 msgid "Back" msgstr "Zurück" -#: src/SlideshowPage.vala:138 +#: src/SlideshowPage.vala:153 msgid "Go to the previous photo" msgstr "Zum vorherigen Foto" -#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:250 +#: src/SlideshowPage.vala:158 src/SlideshowPage.vala:265 msgid "Pause" msgstr "Pause" -#: src/SlideshowPage.vala:145 src/SlideshowPage.vala:251 +#: src/SlideshowPage.vala:160 src/SlideshowPage.vala:266 msgid "Pause the slideshow" msgstr "Diaschau pausieren" -#: src/SlideshowPage.vala:150 +#: src/SlideshowPage.vala:165 msgid "Next" msgstr "Nächstes" -#: src/SlideshowPage.vala:152 +#: src/SlideshowPage.vala:167 msgid "Go to the next photo" msgstr "Zum nächsten Foto" -#: src/SlideshowPage.vala:160 +#: src/SlideshowPage.vala:175 msgid "Change slideshow settings" msgstr "Diaschau konfigurieren" #. An entire slideshow set might be missing, so check for a loop. -#: src/SlideshowPage.vala:214 +#: src/SlideshowPage.vala:229 msgid "All photo source files are missing." msgstr "Es gibt keine Foto-Quelldateien." -#: src/SlideshowPage.vala:246 +#: src/SlideshowPage.vala:261 msgid "Play" msgstr "Abspielen" -#: src/SlideshowPage.vala:247 +#: src/SlideshowPage.vala:262 msgid "Continue the slideshow" msgstr "Diaschau fortsetzen" @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: shotwell-0.15\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/shotwell/issues\n" -"POT-Creation-Date: 2023-02-27 10:15+0000\n" -"PO-Revision-Date: 2023-02-27 22:48+0200\n" +"POT-Creation-Date: 2024-01-06 16:05+0000\n" +"PO-Revision-Date: 2024-02-05 23:08+0200\n" "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n" "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n" "Language: lt\n" @@ -24,11 +24,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"(n%100<10 || n%100>=20) ? 1 : 2)\n" -"X-Generator: Gtranslator 42.0\n" +"(n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Poedit 3.4.2\n" #: data/gsettings/org.gnome.shotwell-extras.gschema.xml:6 -#: data/gsettings/org.gnome.shotwell.gschema.xml:428 +#: data/gsettings/org.gnome.shotwell.gschema.xml:438 msgid "OAuth Access Phase Token" msgstr "OAuth prieigos fazės leksema" @@ -38,7 +38,7 @@ msgstr "" "Autorizacijos leksema šiuo metu prisijungusiam Tumblr naudotojui, jei yra" #: data/gsettings/org.gnome.shotwell-extras.gschema.xml:12 -#: data/gsettings/org.gnome.shotwell.gschema.xml:434 +#: data/gsettings/org.gnome.shotwell.gschema.xml:444 msgid "OAuth Access Phase Token Secret" msgstr "OAuth prieigos fazės leksemos paslaptis" @@ -51,19 +51,19 @@ msgstr "" "leksema šiuo metu prisijungusiam Tumblr naudotojui, jei yra" #: data/gsettings/org.gnome.shotwell-extras.gschema.xml:18 -#: data/gsettings/org.gnome.shotwell.gschema.xml:440 -#: data/gsettings/org.gnome.shotwell.gschema.xml:498 -#: data/gsettings/org.gnome.shotwell.gschema.xml:560 +#: data/gsettings/org.gnome.shotwell.gschema.xml:450 +#: data/gsettings/org.gnome.shotwell.gschema.xml:508 +#: data/gsettings/org.gnome.shotwell.gschema.xml:570 msgid "username" msgstr "naudotojo vardas" #: data/gsettings/org.gnome.shotwell-extras.gschema.xml:19 -#: data/gsettings/org.gnome.shotwell.gschema.xml:441 +#: data/gsettings/org.gnome.shotwell.gschema.xml:451 msgid "The user name of the currently logged in Flickr user, if any" msgstr "Šiuo metu prisijungusio Flickr naudotojo vardas, jei yra" #: data/gsettings/org.gnome.shotwell-extras.gschema.xml:24 -#: data/gsettings/org.gnome.shotwell.gschema.xml:472 +#: data/gsettings/org.gnome.shotwell.gschema.xml:482 msgid "default size" msgstr "numatytasis dydis" @@ -397,59 +397,68 @@ msgstr "Rodyti pavadinimą" msgid "Whether to show the title of a photo during the slideshow" msgstr "Ar rodyti nuotraukos pavadinimą skaidrių demonstracijoje" -#: data/gsettings/org.gnome.shotwell.gschema.xml:218 +#: data/gsettings/org.gnome.shotwell.gschema.xml:216 +#: data/ui/slideshow_settings.ui:154 +msgid "Shuffle" +msgstr "Maišyti" + +#: data/gsettings/org.gnome.shotwell.gschema.xml:217 +msgid "Whether to shuffle the order of photos during the slideshow" +msgstr "Ar sumaišyti nuotraukas skaidrių demonstracijoje" + +#: data/gsettings/org.gnome.shotwell.gschema.xml:224 msgid "maximize library window" msgstr "išdidinti bibliotekos langą" -#: data/gsettings/org.gnome.shotwell.gschema.xml:219 +#: data/gsettings/org.gnome.shotwell.gschema.xml:225 msgid "True if library application is maximized, false otherwise" msgstr "Teigiama, jei bibliotekos programa yra išdidinta" -#: data/gsettings/org.gnome.shotwell.gschema.xml:224 +#: data/gsettings/org.gnome.shotwell.gschema.xml:230 msgid "width of library window" msgstr "bibliotekos lango plotis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:225 +#: data/gsettings/org.gnome.shotwell.gschema.xml:231 msgid "The last recorded width of the library application window" msgstr "Paskutinis įrašytas bibliotekos programos lango plotis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:230 +#: data/gsettings/org.gnome.shotwell.gschema.xml:236 msgid "height of library window" msgstr "bibliotekos lango aukštis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:231 +#: data/gsettings/org.gnome.shotwell.gschema.xml:237 msgid "The last recorded height of the library application window" msgstr "Paskutinis įrašytas bibliotekos programos lango aukštis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:236 +#: data/gsettings/org.gnome.shotwell.gschema.xml:242 msgid "maximize direct-edit window" msgstr "išdidinti tiesioginio redagavimo langą" -#: data/gsettings/org.gnome.shotwell.gschema.xml:237 +#: data/gsettings/org.gnome.shotwell.gschema.xml:243 msgid "True if direct-edit application is maximized, false otherwise" msgstr "Teigiama, jei tiesioginio redagavimo programa yra išdindinta" -#: data/gsettings/org.gnome.shotwell.gschema.xml:242 +#: data/gsettings/org.gnome.shotwell.gschema.xml:248 msgid "width of direct-edit window" msgstr "tiesioginio redagavimo lango plotis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:243 +#: data/gsettings/org.gnome.shotwell.gschema.xml:249 msgid "The last recorded width of the direct-edit application window" msgstr "Paskutinis įrašytas tiesioginio redagavimo lango plotis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:248 +#: data/gsettings/org.gnome.shotwell.gschema.xml:254 msgid "height of direct-edit window" msgstr "tiesioginio redagavimo lango aukštis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:249 +#: data/gsettings/org.gnome.shotwell.gschema.xml:255 msgid "The last recorded height of the direct-edit application window" msgstr "Paskutinis įrašytas tiesioginio redagavimo lango aukštis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:254 +#: data/gsettings/org.gnome.shotwell.gschema.xml:260 msgid "sidebar divider position" msgstr "šoninės juostos skirtuko padėtis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:255 +#: data/gsettings/org.gnome.shotwell.gschema.xml:261 msgid "" "The last recorded position of the divider between the sidebar and view in " "library application window" @@ -457,30 +466,30 @@ msgstr "" "Paskutinė įrašyta šoninės juostos ir rodinio skirtuko padėtis bibliotekos " "programos lange" -#: data/gsettings/org.gnome.shotwell.gschema.xml:262 +#: data/gsettings/org.gnome.shotwell.gschema.xml:268 msgid "import directory" msgstr "importo katalogas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:263 +#: data/gsettings/org.gnome.shotwell.gschema.xml:269 msgid "Directory in which imported photo files are placed" msgstr "Katalogas, kuriama saugomi importuojami nuotraukų failai" -#: data/gsettings/org.gnome.shotwell.gschema.xml:268 +#: data/gsettings/org.gnome.shotwell.gschema.xml:274 msgid "watch library directory for new files" msgstr "stebėti naujus failus bibliotekos aplanke" -#: data/gsettings/org.gnome.shotwell.gschema.xml:269 +#: data/gsettings/org.gnome.shotwell.gschema.xml:275 msgid "" "If true, files added to the library directory are automatically imported" msgstr "" "Jei teigiama, nauji į bibliotekos aplanką pridedami failai yra automatiškai " "importuojami" -#: data/gsettings/org.gnome.shotwell.gschema.xml:274 +#: data/gsettings/org.gnome.shotwell.gschema.xml:280 msgid "write metadata to master files" msgstr "įrašyti meta duomenis į pagrindinius failus" -#: data/gsettings/org.gnome.shotwell.gschema.xml:275 +#: data/gsettings/org.gnome.shotwell.gschema.xml:281 msgid "" "If true, changes to metadata (tags, titles, etc.) are written to the master " "photo file" @@ -488,11 +497,11 @@ msgstr "" "Jei teigiama, meta duomenų pakeitimai (žymos, pavadinimai ir t. t.) yra " "įrašomi į pagrindinį nuotraukos failą" -#: data/gsettings/org.gnome.shotwell.gschema.xml:280 +#: data/gsettings/org.gnome.shotwell.gschema.xml:286 msgid "use lowercase filenames" msgstr "naudoti mažųjų raidžių failų pavadinimus" -#: data/gsettings/org.gnome.shotwell.gschema.xml:281 +#: data/gsettings/org.gnome.shotwell.gschema.xml:287 msgid "" "If true, Shotwell will convert all filenames to lowercase when importing " "photo files" @@ -500,11 +509,11 @@ msgstr "" "Jei teigiama, Shotwell importuojant nuotraukų failus pakeis visus " "pavadinimus į mažąsias raides" -#: data/gsettings/org.gnome.shotwell.gschema.xml:286 +#: data/gsettings/org.gnome.shotwell.gschema.xml:292 msgid "directory pattern" msgstr "aplankų šablonas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:287 +#: data/gsettings/org.gnome.shotwell.gschema.xml:293 msgid "" "A string encoding a naming pattern that will be used to name photo " "directories on import" @@ -512,11 +521,11 @@ msgstr "" "Simbolių eilutė, koduojanti pavadinimo šabloną, naudojamą nuotraukų aplankų " "pavadinimams importuojant" -#: data/gsettings/org.gnome.shotwell.gschema.xml:292 +#: data/gsettings/org.gnome.shotwell.gschema.xml:298 msgid "directory pattern custom" msgstr "pasirinktinis aplankų šablonas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:293 +#: data/gsettings/org.gnome.shotwell.gschema.xml:299 msgid "" "A string encoding a custom naming pattern that will be used to name photo " "directories on import" @@ -524,29 +533,29 @@ msgstr "" "Simbolių eilutė, koduojanti pasirinktinį pavadinimo šabloną, naudojamą " "nuotraukų aplankų pavadinimams importuojant" -#: data/gsettings/org.gnome.shotwell.gschema.xml:298 +#: data/gsettings/org.gnome.shotwell.gschema.xml:304 msgid "RAW developer default" msgstr "RAW kūrėjo numatytieji" -#: data/gsettings/org.gnome.shotwell.gschema.xml:299 +#: data/gsettings/org.gnome.shotwell.gschema.xml:305 msgid "Default option for which RAW developer Shotwell will use" msgstr "Numatytasis parametras, kurį RAW kūrėją Shotwell naudos" -#: data/gsettings/org.gnome.shotwell.gschema.xml:306 +#: data/gsettings/org.gnome.shotwell.gschema.xml:312 msgid "Most-recently-used crop aspect ratio menu choice" msgstr "Paskutinis naudotas apkirpimo proporcijos meniu pasirinkimas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:307 +#: data/gsettings/org.gnome.shotwell.gschema.xml:313 msgid "A numeric code representing the last crop menu choice the user made" msgstr "" "Skaitinis kodas, nusakantis paskutinį naudotojo padarytą apkirpimo meniu " "pasirinkimą" -#: data/gsettings/org.gnome.shotwell.gschema.xml:311 +#: data/gsettings/org.gnome.shotwell.gschema.xml:317 msgid "Most-recently-used crop custom aspect ratio’s numerator" msgstr "Paskutinis naudotas pasirinktinio apkirpimo proporcijos numeratorius" -#: data/gsettings/org.gnome.shotwell.gschema.xml:312 +#: data/gsettings/org.gnome.shotwell.gschema.xml:318 msgid "" "A nonzero, positive integer representing the width part of the last custom " "crop ratio the user entered" @@ -554,11 +563,11 @@ msgstr "" "Nenulinis teigiamas sveikas skaičius, nusakantis paskutinio naudotojo įvesto " "apkirpimo mastelio pločio dalį" -#: data/gsettings/org.gnome.shotwell.gschema.xml:316 +#: data/gsettings/org.gnome.shotwell.gschema.xml:322 msgid "Most-recently-used crop custom aspect ratio’s denominator" msgstr "Paskutinis naudotas pasirinktinio apkirpimo proporcijos denominatorius" -#: data/gsettings/org.gnome.shotwell.gschema.xml:317 +#: data/gsettings/org.gnome.shotwell.gschema.xml:323 msgid "" "A nonzero, positive integer representing the height part of the last custom " "crop ratio the user entered" @@ -566,89 +575,89 @@ msgstr "" "Nenulinis teigiamas sveikas skaičius, nusakantis paskutinio naudotojo įvesto " "apkirpimo mastelio aukščio dalį" -#: data/gsettings/org.gnome.shotwell.gschema.xml:324 +#: data/gsettings/org.gnome.shotwell.gschema.xml:330 msgid "external photo editor" msgstr "išorinis nuotraukų redaktorius" -#: data/gsettings/org.gnome.shotwell.gschema.xml:325 +#: data/gsettings/org.gnome.shotwell.gschema.xml:331 msgid "External application used to edit photos" msgstr "Išorinė programa nuotraukų redagavimui" -#: data/gsettings/org.gnome.shotwell.gschema.xml:330 +#: data/gsettings/org.gnome.shotwell.gschema.xml:336 msgid "external raw editor" msgstr "išorinė RAW rengyklė" -#: data/gsettings/org.gnome.shotwell.gschema.xml:331 +#: data/gsettings/org.gnome.shotwell.gschema.xml:337 msgid "External application used to edit RAW photos" msgstr "Išorinė programa RAW nuotraukų redagavimui" -#: data/gsettings/org.gnome.shotwell.gschema.xml:369 -#: data/gsettings/org.gnome.shotwell.gschema.xml:370 +#: data/gsettings/org.gnome.shotwell.gschema.xml:379 +#: data/gsettings/org.gnome.shotwell.gschema.xml:380 msgid "Setting in export dialog: how to trim images" msgstr "Nuostata eksporto dialoge: kaip apkirpti paveikslėlius" -#: data/gsettings/org.gnome.shotwell.gschema.xml:375 +#: data/gsettings/org.gnome.shotwell.gschema.xml:385 msgid "export metadata" msgstr "eksportuoti metaduomenis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:376 +#: data/gsettings/org.gnome.shotwell.gschema.xml:386 msgid "Setting in export dialog: option to export metadata" msgstr "Nuostata eksporto dialoge: parametras metaduomenų eksportavimui" -#: data/gsettings/org.gnome.shotwell.gschema.xml:381 +#: data/gsettings/org.gnome.shotwell.gschema.xml:391 msgid "format setting, special value" msgstr "formato nuostata, speciali vertė" -#: data/gsettings/org.gnome.shotwell.gschema.xml:382 +#: data/gsettings/org.gnome.shotwell.gschema.xml:392 msgid "Setting in export dialog: format setting, special value" msgstr "Nuostata eksporto dialoge: formato nuostata, speciali vertė" -#: data/gsettings/org.gnome.shotwell.gschema.xml:387 +#: data/gsettings/org.gnome.shotwell.gschema.xml:397 msgid "format setting, type value" msgstr "formato nuostata, tipo vertė" -#: data/gsettings/org.gnome.shotwell.gschema.xml:388 +#: data/gsettings/org.gnome.shotwell.gschema.xml:398 msgid "Setting in export dialog: format setting, type value" msgstr "Nuostata eksporto dialoge: formato nuostata, tipo vertė" -#: data/gsettings/org.gnome.shotwell.gschema.xml:393 +#: data/gsettings/org.gnome.shotwell.gschema.xml:403 msgid "JPEG quality option" msgstr "JPEG kokybės parametras" -#: data/gsettings/org.gnome.shotwell.gschema.xml:394 +#: data/gsettings/org.gnome.shotwell.gschema.xml:404 msgid "Setting in export dialog: jpeg quality option" msgstr "Nuostata eksporto dialoge: JPEG kokybės parametras" -#: data/gsettings/org.gnome.shotwell.gschema.xml:399 +#: data/gsettings/org.gnome.shotwell.gschema.xml:409 msgid "maximal size of image" msgstr "didžiausias paveikslėlio dydis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:400 +#: data/gsettings/org.gnome.shotwell.gschema.xml:410 msgid "Setting in export dialog: maximal size of image" msgstr "Nuostata eksporto dialoge: didžiausias paveikslėlio dydis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:407 +#: data/gsettings/org.gnome.shotwell.gschema.xml:417 msgid "last used publishing service" msgstr "paskutinė naudota viešinimo tarnyba" -#: data/gsettings/org.gnome.shotwell.gschema.xml:408 -#: data/gsettings/org.gnome.shotwell.gschema.xml:414 +#: data/gsettings/org.gnome.shotwell.gschema.xml:418 +#: data/gsettings/org.gnome.shotwell.gschema.xml:424 msgid "" "A numeric code representing the last service to which photos were published" msgstr "" "Skaitinis kodas, nusakantis paskutinę tarnybą, kurioje buvo paskelbtos " "nuotraukos" -#: data/gsettings/org.gnome.shotwell.gschema.xml:413 +#: data/gsettings/org.gnome.shotwell.gschema.xml:423 msgid "default publishing service" msgstr "numatytoji viešinimo tarnyba" -#: data/gsettings/org.gnome.shotwell.gschema.xml:429 +#: data/gsettings/org.gnome.shotwell.gschema.xml:439 msgid "The authorization token for the currently logged in Flickr user, if any" msgstr "" "Autorizacijos leksema šiuo metu prisijungusiam Flickr naudotojui, jei yra" -#: data/gsettings/org.gnome.shotwell.gschema.xml:435 +#: data/gsettings/org.gnome.shotwell.gschema.xml:445 msgid "" "The cryptographic secret used to sign requests against the authorization " "token for the currently logged in Flickr user, if any" @@ -656,45 +665,45 @@ msgstr "" "Kriptografinė paslaptis, naudojama prisijungimo užklausoms su autorizacijos " "leksema šiuo metu prisijungusiam Flickr naudotojui, jei yra" -#: data/gsettings/org.gnome.shotwell.gschema.xml:446 +#: data/gsettings/org.gnome.shotwell.gschema.xml:456 msgid "default size code" msgstr "numatytojo dydžio kodas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:447 +#: data/gsettings/org.gnome.shotwell.gschema.xml:457 msgid "" "A numeric code representing the default size for photos published to Flickr" msgstr "Skaitinis kodas, nusakantis numatytąjį nuotraukų dydį skelbiant Flickr" -#: data/gsettings/org.gnome.shotwell.gschema.xml:452 +#: data/gsettings/org.gnome.shotwell.gschema.xml:462 msgid "default visibility" msgstr "numatytasis matomumas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:453 +#: data/gsettings/org.gnome.shotwell.gschema.xml:463 msgid "" "A numeric code representing the default visibility for photos published to " "Flickr" msgstr "" "Skaitinis kodas, nusakantis numatytąjį nuotraukų matomumą skelbiant Flickr" -#: data/gsettings/org.gnome.shotwell.gschema.xml:458 -#: data/gsettings/org.gnome.shotwell.gschema.xml:484 -#: data/gsettings/org.gnome.shotwell.gschema.xml:534 -#: data/gsettings/org.gnome.shotwell.gschema.xml:584 +#: data/gsettings/org.gnome.shotwell.gschema.xml:468 +#: data/gsettings/org.gnome.shotwell.gschema.xml:494 +#: data/gsettings/org.gnome.shotwell.gschema.xml:544 +#: data/gsettings/org.gnome.shotwell.gschema.xml:594 msgid "remove sensitive info from uploads" msgstr "pašalinti jautrią informaciją iš įkėlimų" -#: data/gsettings/org.gnome.shotwell.gschema.xml:459 +#: data/gsettings/org.gnome.shotwell.gschema.xml:469 msgid "" "Whether images being uploaded to Flickr should have their metadata removed " "first" msgstr "Ar prieš įkeliant paveikslėlius į Flickr pašalinti jų metaduomenis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:466 -#: data/gsettings/org.gnome.shotwell.gschema.xml:604 +#: data/gsettings/org.gnome.shotwell.gschema.xml:476 +#: data/gsettings/org.gnome.shotwell.gschema.xml:614 msgid "refresh token" msgstr "atnaujinimo leksema" -#: data/gsettings/org.gnome.shotwell.gschema.xml:467 +#: data/gsettings/org.gnome.shotwell.gschema.xml:477 msgid "" "The OAuth token used to refresh the Google Photos session for the currently " "logged in user, if any" @@ -702,7 +711,7 @@ msgstr "" "OAuth leksema, naudojama Google Photos seansui atnaujinti šiuo metu " "prisijungusiam naudotojui, jei yra" -#: data/gsettings/org.gnome.shotwell.gschema.xml:473 +#: data/gsettings/org.gnome.shotwell.gschema.xml:483 msgid "" "A numeric code representing the default size for photos uploaded to Google " "Photos Albums" @@ -710,72 +719,72 @@ msgstr "" "Skaitinis kodas, nusakantis numatytąjį nuotraukų dydį įkeliant į Google " "Photos albumus" -#: data/gsettings/org.gnome.shotwell.gschema.xml:478 -#: data/gsettings/org.gnome.shotwell.gschema.xml:578 +#: data/gsettings/org.gnome.shotwell.gschema.xml:488 +#: data/gsettings/org.gnome.shotwell.gschema.xml:588 msgid "last album" msgstr "paskutinis albumas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:479 -#: data/gsettings/org.gnome.shotwell.gschema.xml:579 +#: data/gsettings/org.gnome.shotwell.gschema.xml:489 +#: data/gsettings/org.gnome.shotwell.gschema.xml:589 msgid "The name of the last album the user published photos to, if any" msgstr "Paskutinio albumo, kuriame paskelbtos nuotraukos, pavadinimas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:485 +#: data/gsettings/org.gnome.shotwell.gschema.xml:495 msgid "" "Whether images being uploaded to Google Photos should have their metadata " "removed first" msgstr "" "Ar prieš įkeliant paveikslėlius į Google Photos pašalinti jų metaduomenis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:492 +#: data/gsettings/org.gnome.shotwell.gschema.xml:502 msgid "Piwigo URL" msgstr "Piwigo URL" -#: data/gsettings/org.gnome.shotwell.gschema.xml:493 +#: data/gsettings/org.gnome.shotwell.gschema.xml:503 msgid "URL of the Piwigo server" msgstr "Piwigo serverio URL" -#: data/gsettings/org.gnome.shotwell.gschema.xml:499 +#: data/gsettings/org.gnome.shotwell.gschema.xml:509 msgid "Piwigo username, if logged in" msgstr "Piwigo naudotojo vardas, jei prisijungta" -#: data/gsettings/org.gnome.shotwell.gschema.xml:504 +#: data/gsettings/org.gnome.shotwell.gschema.xml:514 msgid "password" msgstr "slaptažodis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:505 +#: data/gsettings/org.gnome.shotwell.gschema.xml:515 msgid "Piwigo password, if logged in" msgstr "Piwigo slaptažodis, jei prisijungta" -#: data/gsettings/org.gnome.shotwell.gschema.xml:510 +#: data/gsettings/org.gnome.shotwell.gschema.xml:520 msgid "remember password" msgstr "atsiminti slaptažodį" -#: data/gsettings/org.gnome.shotwell.gschema.xml:511 +#: data/gsettings/org.gnome.shotwell.gschema.xml:521 msgid "If true, remember the Piwigo password" msgstr "Jei teigiama, atsiminti Piwigo slaptažodį" -#: data/gsettings/org.gnome.shotwell.gschema.xml:516 +#: data/gsettings/org.gnome.shotwell.gschema.xml:526 msgid "last category" msgstr "paskutinė kategorija" -#: data/gsettings/org.gnome.shotwell.gschema.xml:517 +#: data/gsettings/org.gnome.shotwell.gschema.xml:527 msgid "The last selected Piwigo category" msgstr "Paskutinė pasirinkta Piwigo kategorija" -#: data/gsettings/org.gnome.shotwell.gschema.xml:522 +#: data/gsettings/org.gnome.shotwell.gschema.xml:532 msgid "last permission level" msgstr "paskutinis leidimų lygis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:523 +#: data/gsettings/org.gnome.shotwell.gschema.xml:533 msgid "The last chosen Piwigo permission level" msgstr "Paskutinis pasirinktas Piwigo leidimų lygis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:528 +#: data/gsettings/org.gnome.shotwell.gschema.xml:538 msgid "last photo size" msgstr "paskutinės nuotraukos dydis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:529 +#: data/gsettings/org.gnome.shotwell.gschema.xml:539 msgid "" "A numeric code representing the last photo size preset used when publishing " "to Piwigo" @@ -783,20 +792,20 @@ msgstr "" "Skaitinis kodas, nusakantis paskutinį nuotraukos dydžio parametrą viešinant " "Piwigo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:535 +#: data/gsettings/org.gnome.shotwell.gschema.xml:545 msgid "" "Whether images being uploaded to Piwigo should have their metadata removed " "first" msgstr "Ar prieš įkeliant paveikslėlius į Piwigo pašalinti jų metaduomenis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:540 +#: data/gsettings/org.gnome.shotwell.gschema.xml:550 msgid "" "if title is set and comment unset, use title as comment for uploads to Piwigo" msgstr "" "jei pavadinimas nustatytas, o komentaras nenustatytas, naudoti pavadinimą " "kaip komentarą įkėlimams į Piwigo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:541 +#: data/gsettings/org.gnome.shotwell.gschema.xml:551 msgid "" "Whether images being uploaded to Piwigo should have their comment set from " "the title if title is set and comment unset" @@ -804,11 +813,11 @@ msgstr "" "Ar į Piwigo įkeliamiems paveikslėliams nustatyti komentarą į pavadinimą, jei " "komentaro nėra" -#: data/gsettings/org.gnome.shotwell.gschema.xml:546 +#: data/gsettings/org.gnome.shotwell.gschema.xml:556 msgid "do not upload tags when uploading to Piwigo" msgstr "neįkelti žymų įkeliant į Piwigo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:547 +#: data/gsettings/org.gnome.shotwell.gschema.xml:557 msgid "" "Whether images being uploaded to Piwigo should have their tags removed on " "upload, such that these tags will not appear on the remote Piwigo server" @@ -816,11 +825,11 @@ msgstr "" "Ar prieš įkeliant paveikslėlius į Piwigo pašalinti žymas, kad jų nebūtų " "Piwigo serveryje" -#: data/gsettings/org.gnome.shotwell.gschema.xml:552 +#: data/gsettings/org.gnome.shotwell.gschema.xml:562 msgid "do not upload ratings when uploading to Piwigo" msgstr "neįkelti reigintų įkeliant į Piwigo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:553 +#: data/gsettings/org.gnome.shotwell.gschema.xml:563 msgid "" "Whether images being uploaded to Piwigo should have their ratings uploaded, " "such that these ratings will not appear on the remote Piwigo server" @@ -828,45 +837,45 @@ msgstr "" "Ar įkeliant paveikslėlius į Piwigo reitingų turi būti nepaisoma, kad jų " "nebūtų Piwigo serveryje" -#: data/gsettings/org.gnome.shotwell.gschema.xml:561 +#: data/gsettings/org.gnome.shotwell.gschema.xml:571 msgid "Gallery3 username" msgstr "Gallery3 naudotojo vardas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:566 +#: data/gsettings/org.gnome.shotwell.gschema.xml:576 msgid "API key" msgstr "API raktas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:567 +#: data/gsettings/org.gnome.shotwell.gschema.xml:577 msgid "Gallery3 API key" msgstr "Gallery3 API raktas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:572 +#: data/gsettings/org.gnome.shotwell.gschema.xml:582 msgid "URL" msgstr "URL" -#: data/gsettings/org.gnome.shotwell.gschema.xml:573 +#: data/gsettings/org.gnome.shotwell.gschema.xml:583 msgid "Gallery3 site URL" msgstr "Gallery3 tinklalapio URL" -#: data/gsettings/org.gnome.shotwell.gschema.xml:585 +#: data/gsettings/org.gnome.shotwell.gschema.xml:595 msgid "" "Whether images being uploaded to Gallery3 should have their metadata removed " "first" msgstr "Ar prieš įkeliant paveikslėlius į Gallery3 pašalinti jų metaduomenis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:590 +#: data/gsettings/org.gnome.shotwell.gschema.xml:600 msgid "scaling constraint of uploaded picture" msgstr "ištempimo ribojimas įkeliamam paveikslėliui" -#: data/gsettings/org.gnome.shotwell.gschema.xml:591 +#: data/gsettings/org.gnome.shotwell.gschema.xml:601 msgid "The scaling constraint ID of the picture to be uploaded" msgstr "Ištempimo ribojimo ID įkeliamam paveikslėliui" -#: data/gsettings/org.gnome.shotwell.gschema.xml:596 +#: data/gsettings/org.gnome.shotwell.gschema.xml:606 msgid "pixels of the major axis uploaded picture" msgstr "pikseliai pagrindinėje įkeliamo paveikslėlio ašyje" -#: data/gsettings/org.gnome.shotwell.gschema.xml:597 +#: data/gsettings/org.gnome.shotwell.gschema.xml:607 msgid "" "The pixels of the major axis of the picture to be uploaded; used only if " "scaling-constraint-id is an appropriate value" @@ -874,7 +883,7 @@ msgstr "" "Pikseliai pagrindinėje įkeliamo paveikslėlio ašyje; naudojama tik jei " "scaling-constraint-id yra atitinkamos vertės" -#: data/gsettings/org.gnome.shotwell.gschema.xml:605 +#: data/gsettings/org.gnome.shotwell.gschema.xml:615 msgid "" "The OAuth token used to refresh the YouTube session for the currently logged " "in user, if any" @@ -882,56 +891,56 @@ msgstr "" "OAuth leksema, naudojama YouTube seansui atnaujinti šiuo metu prisijungusiam " "naudotojui, jei yra" -#: data/gsettings/org.gnome.shotwell.gschema.xml:612 +#: data/gsettings/org.gnome.shotwell.gschema.xml:622 msgid "last used import service" msgstr "paskutinė naudota importo tarnyba" -#: data/gsettings/org.gnome.shotwell.gschema.xml:613 +#: data/gsettings/org.gnome.shotwell.gschema.xml:623 msgid "" "A numeric code representing the last service from which photos were imported" msgstr "" "Skaitinis kodas, nusakanti paskutinę tarnybą, iš kurios buvo importuotos " "nuotraukos" -#: data/gsettings/org.gnome.shotwell.gschema.xml:620 +#: data/gsettings/org.gnome.shotwell.gschema.xml:630 msgid "content layout mode" msgstr "turinio išdėstymo veiksena" -#: data/gsettings/org.gnome.shotwell.gschema.xml:621 +#: data/gsettings/org.gnome.shotwell.gschema.xml:631 msgid "" "A numeric code that describes how photos are laid out on the page during " "printing" msgstr "Skaitinis kodas, aprašantis, kaip išdėstyti nuotraukas spausdinant" -#: data/gsettings/org.gnome.shotwell.gschema.xml:626 +#: data/gsettings/org.gnome.shotwell.gschema.xml:636 msgid "content ppi" msgstr "turinio ppi" -#: data/gsettings/org.gnome.shotwell.gschema.xml:627 +#: data/gsettings/org.gnome.shotwell.gschema.xml:637 msgid "The number of pixels per inch (ppi) sent to the printer during printing" msgstr "Pikselių colyje skaičius, siunčiama į spausdintuvą spausdinant" -#: data/gsettings/org.gnome.shotwell.gschema.xml:632 +#: data/gsettings/org.gnome.shotwell.gschema.xml:642 msgid "content width" msgstr "turinio plotis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:633 +#: data/gsettings/org.gnome.shotwell.gschema.xml:643 msgid "The width of the printed emulsion on the page when printing" msgstr "Spausdinamos emulsijos plotis puslapyje" -#: data/gsettings/org.gnome.shotwell.gschema.xml:638 +#: data/gsettings/org.gnome.shotwell.gschema.xml:648 msgid "content height" msgstr "turinio aukštis" -#: data/gsettings/org.gnome.shotwell.gschema.xml:639 +#: data/gsettings/org.gnome.shotwell.gschema.xml:649 msgid "The height of the printed emulsion on the page when printing" msgstr "Spausdinamos emulsijos aukštis puslapyje" -#: data/gsettings/org.gnome.shotwell.gschema.xml:644 +#: data/gsettings/org.gnome.shotwell.gschema.xml:654 msgid "content units" msgstr "turinio vienetai" -#: data/gsettings/org.gnome.shotwell.gschema.xml:645 +#: data/gsettings/org.gnome.shotwell.gschema.xml:655 msgid "" "A numeric code representing unit of measure (inches or centimeters) used " "when printing" @@ -939,11 +948,11 @@ msgstr "" "Skaitinis kodas, nusakantis naudojamus matavimo vienetus (colius arba " "centimetrus) spausdinant" -#: data/gsettings/org.gnome.shotwell.gschema.xml:650 +#: data/gsettings/org.gnome.shotwell.gschema.xml:660 msgid "images per page code" msgstr "paveikslėlių puslapyje" -#: data/gsettings/org.gnome.shotwell.gschema.xml:651 +#: data/gsettings/org.gnome.shotwell.gschema.xml:661 msgid "" "A numeric code representing the currently selected images per page mode used " "when printing" @@ -951,20 +960,20 @@ msgstr "" "Skaitinis kodas, nusakanti šiuo metu pasirinktą paveikslėlių puslapyje tipą " "spausdinant" -#: data/gsettings/org.gnome.shotwell.gschema.xml:656 +#: data/gsettings/org.gnome.shotwell.gschema.xml:666 msgid "size selection" msgstr "dydžio žymėjimas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:657 +#: data/gsettings/org.gnome.shotwell.gschema.xml:667 msgid "" "The index of the current print size in a pre-defined list of standard sizes" msgstr "Dabartinio spausdinimo dydžio indeksas standartinių dydžių sąraše" -#: data/gsettings/org.gnome.shotwell.gschema.xml:662 +#: data/gsettings/org.gnome.shotwell.gschema.xml:672 msgid "match aspect ratio" msgstr "išlaikyti proporcijas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:663 +#: data/gsettings/org.gnome.shotwell.gschema.xml:673 msgid "" "Determines whether custom print sizes must match the aspect ratio of the " "original photo" @@ -972,11 +981,11 @@ msgstr "" "Nusako, ar pasirinktiniai spausdinimo dydžiai turi išlaikyti originalios " "nuotraukos proporcijas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:668 +#: data/gsettings/org.gnome.shotwell.gschema.xml:678 msgid "print titles" msgstr "spausdinti pavadinimus" -#: data/gsettings/org.gnome.shotwell.gschema.xml:669 +#: data/gsettings/org.gnome.shotwell.gschema.xml:679 msgid "" "True if the title of a photo should be printed when the photo is printed, " "false otherwise" @@ -984,166 +993,168 @@ msgstr "" "Teigiama, jei nuotraukos pavadinimas turi būti spausdinamas spausdinant " "nuotrauką" -#: data/gsettings/org.gnome.shotwell.gschema.xml:674 +#: data/gsettings/org.gnome.shotwell.gschema.xml:684 msgid "titles font" msgstr "pavadinimų šriftas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:675 +#: data/gsettings/org.gnome.shotwell.gschema.xml:685 msgid "The name of the font to use for photo titles when they are printed" msgstr "Naudotino šrifto pavadinimas spausdinant nuotraukų pavadinimus" -#: data/gsettings/org.gnome.shotwell.gschema.xml:686 +#: data/gsettings/org.gnome.shotwell.gschema.xml:696 msgid "enable flickr publishing plugin" msgstr "įjungti flickr skelbimo įskiepį" -#: data/gsettings/org.gnome.shotwell.gschema.xml:687 +#: data/gsettings/org.gnome.shotwell.gschema.xml:697 msgid "True if the Flickr publishing plugin is enabled, false otherwise" msgstr "Teigiama, jei skelbimo Flickr įskiepis yra įjungtas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:692 +#: data/gsettings/org.gnome.shotwell.gschema.xml:702 +#: data/gsettings/org.gnome.shotwell.gschema.xml:708 msgid "enable Google Photos publishing plugin" msgstr "įjungti Google Photos skelbimo įskiepį" -#: data/gsettings/org.gnome.shotwell.gschema.xml:693 +#: data/gsettings/org.gnome.shotwell.gschema.xml:703 +#: data/gsettings/org.gnome.shotwell.gschema.xml:709 msgid "True if the Google Photos publishing plugin is enabled, false otherwise" msgstr "Teigiama, jei skelbimo Google Photos įskiepis yra įjungtas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:698 +#: data/gsettings/org.gnome.shotwell.gschema.xml:714 msgid "enable youtube publishing plugin" msgstr "įjungti youtube skelbimo įskiepį" -#: data/gsettings/org.gnome.shotwell.gschema.xml:699 +#: data/gsettings/org.gnome.shotwell.gschema.xml:715 msgid "True if the YouTube publishing plugin is enabled, false otherwise" msgstr "Teigiama, jei skelbimo YouTube įskiepis yra įjungtas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:704 +#: data/gsettings/org.gnome.shotwell.gschema.xml:720 msgid "enable piwigo publishing plugin" msgstr "įjungti piwigo skelbimo įskiepį" -#: data/gsettings/org.gnome.shotwell.gschema.xml:705 +#: data/gsettings/org.gnome.shotwell.gschema.xml:721 msgid "True if the Piwigo publishing plugin is enabled, false otherwise" msgstr "Teigiama, jei skelbimo Piwigo įskiepis yra įjungtas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:710 +#: data/gsettings/org.gnome.shotwell.gschema.xml:726 msgid "enable tumblr publishing plugin" msgstr "įjungti tumblr skelbimo įskiepį" -#: data/gsettings/org.gnome.shotwell.gschema.xml:711 +#: data/gsettings/org.gnome.shotwell.gschema.xml:727 msgid "True if the Tumblr publishing plugin is enabled, false otherwise" msgstr "Teigiama, jei skelbimo Tumblr įskiepis yra įjungtas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:716 +#: data/gsettings/org.gnome.shotwell.gschema.xml:732 msgid "enable gallery3 publishing plugin" msgstr "įjungti gallery3 skelbimo įskiepį" -#: data/gsettings/org.gnome.shotwell.gschema.xml:717 +#: data/gsettings/org.gnome.shotwell.gschema.xml:733 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise" msgstr "Teigiama, jei skelbimo Gallery3 įskiepis yra įjungtas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:722 +#: data/gsettings/org.gnome.shotwell.gschema.xml:738 msgid "enable slideshow crumble transition" msgstr "įjungti skaidrių demonstracijos drebėjimo perėjimą" -#: data/gsettings/org.gnome.shotwell.gschema.xml:723 +#: data/gsettings/org.gnome.shotwell.gschema.xml:739 msgid "" "True if the Crumble slideshow transition plugin is enabled, false otherwise" msgstr "Teigiama, jei įjungtas skaidrių demonstracijos drebėjimo perėjimas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:728 +#: data/gsettings/org.gnome.shotwell.gschema.xml:744 msgid "enable slideshow fade transition" msgstr "įjungti skaidrių demonstracijos išnykimo perėjimą" -#: data/gsettings/org.gnome.shotwell.gschema.xml:729 +#: data/gsettings/org.gnome.shotwell.gschema.xml:745 msgid "" "True if the Fade slideshow transition plugin is enabled, false otherwise" msgstr "Teigiama, jei įjungtas skaidrių demonstracijos išnykimo perėjimas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:734 +#: data/gsettings/org.gnome.shotwell.gschema.xml:750 msgid "enable slideshow slide transition" msgstr "įjungti skaidrių demonstracijos slinkimo perėjimą" -#: data/gsettings/org.gnome.shotwell.gschema.xml:735 +#: data/gsettings/org.gnome.shotwell.gschema.xml:751 msgid "" "True if the Slide slideshow transition plugin is enabled, false otherwise" msgstr "Teigiama, jei įjungtas skaidrių demonstracijos slinkimo perėjimas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:740 +#: data/gsettings/org.gnome.shotwell.gschema.xml:756 msgid "enable slideshow clock transition" msgstr "įjungti skaidrių demonstracijos laikrodžio perėjimą" -#: data/gsettings/org.gnome.shotwell.gschema.xml:741 +#: data/gsettings/org.gnome.shotwell.gschema.xml:757 msgid "" "True if the Clock slideshow transition plugin is enabled, false otherwise" msgstr "Teigiama, jei įjungtas skaidrių demonstracijos laikrodžio perėjimas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:746 +#: data/gsettings/org.gnome.shotwell.gschema.xml:762 msgid "enable slideshow circle transition" msgstr "įjungti skaidrių demonstracijos skritulio perėjimą" -#: data/gsettings/org.gnome.shotwell.gschema.xml:747 +#: data/gsettings/org.gnome.shotwell.gschema.xml:763 msgid "" "True if the Circle slideshow transition plugin is enabled, false otherwise" msgstr "Teigiama, jei įjungtas skaidrių demonstracijos skritulio perėjimas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:752 +#: data/gsettings/org.gnome.shotwell.gschema.xml:768 msgid "enable slideshow circles transition" msgstr "įjungti skaidrių demonstracijos skritulių perėjimą" -#: data/gsettings/org.gnome.shotwell.gschema.xml:753 +#: data/gsettings/org.gnome.shotwell.gschema.xml:769 msgid "" "True if the Circles slideshow transition plugin is enabled, false otherwise" msgstr "Teigiama, jei įjungtas skaidrių demonstracijos skritulių perėjimas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:758 +#: data/gsettings/org.gnome.shotwell.gschema.xml:774 msgid "enable slideshow blinds transition" msgstr "įjungti skaidrių demonstracijos žaliuzių perėjimą" -#: data/gsettings/org.gnome.shotwell.gschema.xml:759 +#: data/gsettings/org.gnome.shotwell.gschema.xml:775 msgid "" "True if the Blinds slideshow transition plugin is enabled, false otherwise" msgstr "Teigiama, jei įjungtas skaidrių demonstracijos žaliuzių perėjimas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:764 +#: data/gsettings/org.gnome.shotwell.gschema.xml:780 msgid "enable slideshow squares transition" msgstr "įjungti skaidrių demonstracijos kvadratų perėjimą" -#: data/gsettings/org.gnome.shotwell.gschema.xml:765 +#: data/gsettings/org.gnome.shotwell.gschema.xml:781 msgid "" "True if the Squares slideshow transition plugin is enabled, false otherwise" msgstr "Teigiama, jei įjungtas skaidrių demonstracijos kvadratų perėjimas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:770 +#: data/gsettings/org.gnome.shotwell.gschema.xml:786 msgid "enable slideshow stripes transition" msgstr "įjungti skaidrių demonstracijos juostelių perėjimą" -#: data/gsettings/org.gnome.shotwell.gschema.xml:771 +#: data/gsettings/org.gnome.shotwell.gschema.xml:787 msgid "" "True if the Stripes slideshow transition plugin is enabled, false otherwise" msgstr "Teigiama, jei įjungtas skaidrių demonstracijos juostų perėjimas" -#: data/gsettings/org.gnome.shotwell.gschema.xml:776 +#: data/gsettings/org.gnome.shotwell.gschema.xml:792 msgid "enable slideshow chess transition" msgstr "įjungti skaidrių demonstracijos šachmatinį perėjimą" -#: data/gsettings/org.gnome.shotwell.gschema.xml:777 +#: data/gsettings/org.gnome.shotwell.gschema.xml:793 msgid "" "True if the Chess-Board slideshow transition plugin is enabled, false " "otherwise" msgstr "Teigiama, jei įjungtas skaidrių demonstracijos šachmatų perėjimas" -#: data/org.gnome.Shotwell.appdata.xml.in:8 +#: data/org.gnome.Shotwell.appdata.xml.in:9 #: data/org.gnome.Shotwell.desktop.in:4 data/ui/collection.ui:85 #: data/ui/event.ui:356 data/ui/event.ui:524 data/ui/faces.ui:356 -#: data/ui/media.ui:356 data/ui/photo_context.ui:91 data/ui/photo.ui:351 +#: data/ui/media.ui:356 data/ui/photo_context.ui:91 data/ui/photo.ui:349 #: data/ui/tags.ui:356 src/photos/RawSupport.vala:313 msgid "Shotwell" msgstr "Shotwell" -#: data/org.gnome.Shotwell.appdata.xml.in:9 +#: data/org.gnome.Shotwell.appdata.xml.in:10 msgid "Digital photo organizer" msgstr "Skaitmeninių nuotraukų tvarkyklė" -#: data/org.gnome.Shotwell.appdata.xml.in:11 +#: data/org.gnome.Shotwell.appdata.xml.in:12 msgid "" "Shotwell is an easy-to-use, fast photo organizer designed for the GNOME " "desktop. It allows you to import photos from your camera or disk, organize " @@ -1160,7 +1171,7 @@ msgstr "" "nepakeičia pagrindinių nuotraukų, todėl lengva eksperimentuoti ir ištaisyti " "klaidas." -#: data/org.gnome.Shotwell.appdata.xml.in:18 +#: data/org.gnome.Shotwell.appdata.xml.in:19 msgid "" "When ready, Shotwell can upload your photos to various web services, such as " "Flickr, Google Photos, and more." @@ -1168,7 +1179,7 @@ msgstr "" "Kai pasirengusi, Shotwell gali įkelti jūsų nuotraukas į įvairias " "internetines tarnybas, tokias kaip Flickr, Google Photos ir daug kitų." -#: data/org.gnome.Shotwell.appdata.xml.in:22 +#: data/org.gnome.Shotwell.appdata.xml.in:23 msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats." msgstr "Shotwell palaiko JPEG, PNG, TIFF ir įvairius RAW failų formatus." @@ -1176,8 +1187,7 @@ msgstr "Shotwell palaiko JPEG, PNG, TIFF ir įvairius RAW failų formatus." msgid "The Shotwell developers" msgstr "Shotwell kūrėjai" -#: data/org.gnome.Shotwell.desktop.in:5 -#: data/org.gnome.Shotwell-Profile-Browser.desktop.in:5 src/Resources.vala:9 +#: data/org.gnome.Shotwell.desktop.in:5 src/Resources.vala:9 msgid "Photo Manager" msgstr "Nuotraukų tvarkytuvė" @@ -1197,11 +1207,7 @@ msgstr "" "spausdinti;skelbti;viešinti;sukti;žymos;vaizdo įrašai;flickr;picasa;youtube;" "piwigo;" -#: data/org.gnome.Shotwell-Profile-Browser.desktop.in:4 -msgid "Shotwell Profile Browser" -msgstr "Shotwell profilio žiūryklė" - -#: data/org.gnome.Shotwell-Profile-Browser.desktop.in:6 +#: data/org.gnome.Shotwell.desktop.in:21 msgid "Manage Different Profiles In Shotwell" msgstr "Tvarkykite skirtingus Shotwell profilius" @@ -1214,99 +1220,99 @@ msgid "Photo Viewer" msgstr "Paveikslėlių peržiūra" #: data/ui/collection.ui:8 data/ui/direct_context.ui:7 data/ui/direct.ui:136 -#: data/ui/event.ui:447 data/ui/photo_context.ui:6 data/ui/photo.ui:227 -#: src/CollectionPage.vala:119 src/Resources.vala:152 +#: data/ui/event.ui:447 data/ui/photo_context.ui:6 data/ui/photo.ui:225 +#: src/CollectionPage.vala:119 src/Resources.vala:153 msgid "_Enhance" msgstr "Pa_gerinti" #: data/ui/collection.ui:13 data/ui/direct_context.ui:12 data/ui/direct.ui:163 -#: data/ui/event.ui:452 data/ui/photo_context.ui:11 data/ui/photo.ui:254 -#: src/CollectionPage.vala:120 src/Resources.vala:180 +#: data/ui/event.ui:452 data/ui/photo_context.ui:11 data/ui/photo.ui:252 +#: src/CollectionPage.vala:120 src/Resources.vala:181 msgid "Re_vert to Original" msgstr "A_tstatyti originalią" #: data/ui/collection.ui:19 data/ui/event.ui:407 data/ui/event.ui:458 -#: data/ui/faces.ui:390 data/ui/media.ui:390 data/ui/photo.ui:379 -#: data/ui/tags.ui:390 src/Resources.vala:278 +#: data/ui/faces.ui:390 data/ui/media.ui:390 data/ui/photo.ui:377 +#: data/ui/tags.ui:390 src/Resources.vala:279 msgid "Add _Tags…" msgstr "Pridė_ti žymų…" #: data/ui/collection.ui:24 data/ui/event.ui:412 data/ui/event.ui:463 #: data/ui/faces.ui:395 data/ui/media.ui:395 data/ui/photo_context.ui:22 -#: data/ui/photo.ui:384 data/ui/tags.ui:395 src/Resources.vala:350 +#: data/ui/photo.ui:382 data/ui/tags.ui:395 src/Resources.vala:351 msgid "Modif_y Tags…" msgstr "Keisti ž_ymas…" #: data/ui/collection.ui:33 data/ui/event.ui:281 data/ui/event.ui:472 #: data/ui/faces.ui:281 data/ui/media.ui:281 data/ui/photo_context.ui:30 -#: data/ui/photo.ui:272 data/ui/tags.ui:281 +#: data/ui/photo.ui:270 data/ui/tags.ui:281 msgid "Toggle _Flag" msgstr "Per_jungti žymą" #: data/ui/collection.ui:39 data/ui/event.ui:286 data/ui/event.ui:478 #: data/ui/faces.ui:286 data/ui/media.ui:286 data/ui/photo_context.ui:35 -#: data/ui/photo.ui:277 data/ui/tags.ui:286 src/Resources.vala:212 +#: data/ui/photo.ui:275 data/ui/tags.ui:286 src/Resources.vala:213 msgid "_Set Rating" msgstr "Į_vertinti" #: data/ui/collection.ui:62 data/ui/event.ui:314 data/ui/event.ui:501 #: data/ui/faces.ui:314 data/ui/media.ui:314 data/ui/photo_context.ui:63 -#: data/ui/photo.ui:305 data/ui/tags.ui:314 src/Resources.vala:222 +#: data/ui/photo.ui:303 data/ui/tags.ui:314 src/Resources.vala:223 msgid "_Unrated" msgstr "_Neįvertinta" #: data/ui/collection.ui:66 data/ui/event.ui:319 data/ui/event.ui:505 #: data/ui/faces.ui:319 data/ui/media.ui:319 data/ui/photo_context.ui:68 -#: data/ui/photo.ui:310 data/ui/tags.ui:319 src/Resources.vala:228 +#: data/ui/photo.ui:308 data/ui/tags.ui:319 src/Resources.vala:229 msgid "_Rejected" msgstr "_Atmesta" #: data/ui/collection.ui:72 data/ui/event.ui:326 data/ui/event.ui:511 #: data/ui/faces.ui:326 data/ui/media.ui:326 data/ui/photo_context.ui:75 -#: data/ui/photo.ui:317 data/ui/tags.ui:326 src/Resources.vala:216 +#: data/ui/photo.ui:315 data/ui/tags.ui:326 src/Resources.vala:217 msgid "_Increase" msgstr "_Padidinti" #: data/ui/collection.ui:76 data/ui/event.ui:331 data/ui/event.ui:515 #: data/ui/faces.ui:331 data/ui/media.ui:331 data/ui/photo_context.ui:80 -#: data/ui/photo.ui:322 data/ui/tags.ui:331 src/Resources.vala:219 +#: data/ui/photo.ui:320 data/ui/tags.ui:331 src/Resources.vala:220 msgid "_Decrease" msgstr "_Sumažinti" #: data/ui/collection.ui:82 data/ui/event.ui:353 data/ui/event.ui:521 #: data/ui/faces.ui:353 data/ui/media.ui:353 data/ui/photo_context.ui:88 -#: data/ui/photo.ui:348 data/ui/tags.ui:353 +#: data/ui/photo.ui:346 data/ui/tags.ui:353 msgid "_Developer" msgstr "_Kūrėjas" #: data/ui/collection.ui:90 data/ui/event.ui:361 data/ui/event.ui:529 #: data/ui/faces.ui:361 data/ui/media.ui:361 data/ui/photo_context.ui:96 -#: data/ui/photo.ui:356 data/ui/tags.ui:361 src/camera/CameraBranch.vala:99 +#: data/ui/photo.ui:354 data/ui/tags.ui:361 src/camera/CameraBranch.vala:99 #: src/camera/ImportPage.vala:709 src/photos/RawSupport.vala:316 msgid "Camera" msgstr "Fotoaparatas" #: data/ui/collection.ui:98 data/ui/event.ui:340 data/ui/event.ui:537 #: data/ui/faces.ui:340 data/ui/media.ui:340 data/ui/photo_context.ui:105 -#: data/ui/photo.ui:331 data/ui/tags.ui:340 src/Resources.vala:264 +#: data/ui/photo.ui:329 data/ui/tags.ui:340 src/Resources.vala:265 msgid "Edit _Title…" msgstr "_Taisyti pavadinimą…" #: data/ui/collection.ui:103 data/ui/events_directory.ui:144 #: data/ui/events_directory.ui:186 data/ui/event.ui:345 data/ui/event.ui:398 #: data/ui/event.ui:542 data/ui/faces.ui:345 data/ui/media.ui:345 -#: data/ui/photo_context.ui:110 data/ui/photo.ui:336 data/ui/tags.ui:345 -#: src/Resources.vala:268 +#: data/ui/photo_context.ui:110 data/ui/photo.ui:334 data/ui/tags.ui:345 +#: src/Resources.vala:269 msgid "Edit _Comment…" msgstr "Keisti _komentarą…" #: data/ui/collection.ui:108 data/ui/event.ui:547 data/ui/photo_context.ui:115 -#: data/ui/photo.ui:365 src/CollectionPage.vala:143 src/Resources.vala:285 +#: data/ui/photo.ui:363 src/CollectionPage.vala:143 src/Resources.vala:286 msgid "Open With E_xternal Editor" msgstr "Atverti išoriniu _redaktoriumi" #: data/ui/collection.ui:113 data/ui/event.ui:552 data/ui/photo_context.ui:120 -#: data/ui/photo.ui:370 src/CollectionPage.vala:146 src/Resources.vala:287 +#: data/ui/photo.ui:368 src/CollectionPage.vala:146 src/Resources.vala:288 msgid "Open With RA_W Editor" msgstr "Atverti RA_W rengyklėje" @@ -1320,55 +1326,55 @@ msgstr "Rodyti šios nuotraukos į_vykį" #: data/ui/event.ui:27 data/ui/event.ui:562 data/ui/faces.ui:27 #: data/ui/media.ui:27 data/ui/photo_context.ui:130 data/ui/photo.ui:37 #: data/ui/tags.ui:27 data/ui/trash.ui:19 data/ui/trash.ui:227 -#: src/Resources.vala:776 +#: src/Resources.vala:777 msgid "Show in File Mana_ger" msgstr "Rodyti failų _tvarkytuvėje" #: data/ui/collection.ui:128 data/ui/direct_context.ui:23 data/ui/direct.ui:23 #: data/ui/event.ui:567 data/ui/photo.ui:30 src/CollectionPage.vala:83 -#: src/Resources.vala:289 +#: src/Resources.vala:290 msgid "Send _To…" msgstr "_Kam siųsti…" #: data/ui/collection.ui:134 data/ui/event.ui:79 data/ui/event.ui:573 #: data/ui/faces.ui:79 data/ui/media.ui:79 data/ui/photo_context.ui:141 -#: data/ui/photo.ui:84 data/ui/tags.ui:79 src/Resources.vala:785 +#: data/ui/photo.ui:84 data/ui/tags.ui:79 src/Resources.vala:786 msgid "_Move to Trash" msgstr "_Perkelti į šiukšlinę" -#: data/ui/collection.ui:148 src/Resources.vala:108 +#: data/ui/collection.ui:148 src/Resources.vala:109 msgid "Rotate the photos right (press Ctrl to rotate left)" msgstr "Pasukti nuotraukas dešinėn (kairėn pasuksite spausdami Ctrl klavišą)" -#: data/ui/collection.ui:151 src/Resources.vala:106 src/Resources.vala:111 +#: data/ui/collection.ui:151 src/Resources.vala:107 src/Resources.vala:112 msgid "Rotate" msgstr "Pasukti" -#: data/ui/collection.ui:164 src/Resources.vala:154 +#: data/ui/collection.ui:164 src/Resources.vala:155 msgid "Automatically improve the photo’s appearance" msgstr "Automatiškai pagerinti nuotraukos vaizdą" -#: data/ui/collection.ui:167 src/Resources.vala:153 +#: data/ui/collection.ui:167 src/Resources.vala:154 msgid "Enhance" msgstr "Pagerinti" -#: data/ui/collection.ui:189 src/Resources.vala:262 +#: data/ui/collection.ui:189 src/Resources.vala:263 msgid "Publish to various websites" msgstr "Skelbti įvairiose svetainėse" #: data/ui/collection.ui:192 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:284 -#: src/Resources.vala:261 +#: src/Resources.vala:262 msgid "Publish" msgstr "Skelbti" #: data/ui/collection.ui:214 data/ui/offline.ui:236 data/ui/trash.ui:309 -#: src/Resources.vala:294 +#: src/Resources.vala:295 msgid "Find an image by typing text that appears in its name or tags" msgstr "Rasti paveikslėlį rašant tekstą, kuris yra jo pavadinime ar žymose" #: data/ui/collection.ui:217 data/ui/offline.ui:239 data/ui/trash.ui:312 -#: src/Resources.vala:293 +#: src/Resources.vala:294 msgid "Find" msgstr "Ieškoti" @@ -1379,8 +1385,10 @@ msgstr "Ieškoti" msgid "_File" msgstr "_Failas" +#. Check if we can write the target format +#. TODO: Check if we can actually write to the file #: data/ui/direct.ui:8 data/ui/textentrydialog.ui:33 -#: src/direct/DirectPhotoPage.vala:323 src/Resources.vala:141 +#: src/direct/DirectPhotoPage.vala:327 src/Resources.vala:142 msgid "_Save" msgstr "Į_rašyti" @@ -1391,28 +1399,28 @@ msgstr "Įrašyti k_aip…" #: data/ui/direct.ui:37 data/ui/events_directory.ui:25 data/ui/event.ui:40 #: data/ui/faces.ui:40 data/ui/import_queue.ui:31 data/ui/import.ui:33 #: data/ui/media.ui:40 data/ui/offline.ui:25 data/ui/photo.ui:50 -#: data/ui/tags.ui:40 data/ui/trash.ui:30 src/Resources.vala:137 +#: data/ui/tags.ui:40 data/ui/trash.ui:30 src/Resources.vala:138 msgid "_Quit" msgstr "Iš_eiti" #: data/ui/direct.ui:44 data/ui/events_directory.ui:32 data/ui/event.ui:47 #: data/ui/faces.ui:47 data/ui/import.ui:40 data/ui/media.ui:47 #: data/ui/offline.ui:32 data/ui/photo.ui:57 data/ui/tags.ui:47 -#: data/ui/trash.ui:37 src/Resources.vala:125 +#: data/ui/trash.ui:37 src/Resources.vala:126 msgid "_Edit" msgstr "_Taisa" #: data/ui/direct.ui:47 data/ui/events_directory.ui:35 data/ui/event.ui:50 #: data/ui/faces.ui:50 data/ui/import.ui:43 data/ui/media.ui:50 #: data/ui/offline.ui:35 data/ui/photo.ui:60 data/ui/tags.ui:50 -#: data/ui/trash.ui:40 src/Resources.vala:190 +#: data/ui/trash.ui:40 src/Resources.vala:191 msgid "_Undo" msgstr "_Atšaukti" #: data/ui/direct.ui:52 data/ui/events_directory.ui:40 data/ui/event.ui:55 #: data/ui/faces.ui:55 data/ui/import.ui:48 data/ui/media.ui:55 #: data/ui/offline.ui:40 data/ui/photo.ui:65 data/ui/tags.ui:55 -#: data/ui/trash.ui:45 src/Resources.vala:193 +#: data/ui/trash.ui:45 src/Resources.vala:194 msgid "_Redo" msgstr "Paka_rtoti" @@ -1424,19 +1432,19 @@ msgid "_View" msgstr "_Rodymas" #: data/ui/direct.ui:62 data/ui/events_directory.ui:125 data/ui/photo.ui:175 -#: src/Resources.vala:127 +#: src/Resources.vala:128 msgid "Fulls_creen" msgstr "_Visame ekrane" #: data/ui/direct.ui:69 data/ui/event.ui:260 data/ui/faces.ui:260 #: data/ui/media.ui:260 data/ui/photo.ui:146 data/ui/tags.ui:260 -#: src/Resources.vala:149 +#: src/Resources.vala:150 msgid "Zoom _In" msgstr "_Didinti" #: data/ui/direct.ui:74 data/ui/event.ui:265 data/ui/faces.ui:265 #: data/ui/media.ui:265 data/ui/photo.ui:151 data/ui/tags.ui:265 -#: src/Resources.vala:150 +#: src/Resources.vala:151 msgid "Zoom _Out" msgstr "_Mažinti" @@ -1460,52 +1468,52 @@ msgstr "_Nuotrauka" msgid "_Previous Photo" msgstr "_Ankstesnė nuotrauka" -#: data/ui/direct.ui:106 data/ui/photo.ui:197 +#: data/ui/direct.ui:106 data/ui/photo.ui:196 msgid "_Next Photo" msgstr "_Kita nuotrauka" -#: data/ui/direct.ui:113 data/ui/photo.ui:204 src/CollectionPage.vala:110 -#: src/Resources.vala:105 +#: data/ui/direct.ui:113 data/ui/photo.ui:202 src/CollectionPage.vala:110 +#: src/Resources.vala:106 msgid "Rotate _Right" msgstr "Pasukti _dešinėn" -#: data/ui/direct.ui:118 data/ui/photo.ui:209 src/CollectionPage.vala:113 -#: src/Resources.vala:110 +#: data/ui/direct.ui:118 data/ui/photo.ui:207 src/CollectionPage.vala:113 +#: src/Resources.vala:111 msgid "Rotate _Left" msgstr "Pasukti _kairėn" -#: data/ui/direct.ui:123 data/ui/photo.ui:214 src/CollectionPage.vala:116 -#: src/Resources.vala:115 +#: data/ui/direct.ui:123 data/ui/photo.ui:212 src/CollectionPage.vala:116 +#: src/Resources.vala:116 msgid "Flip Hori_zontally" msgstr "Apsukti hori_zontaliai" -#: data/ui/direct.ui:127 data/ui/photo.ui:218 src/CollectionPage.vala:117 -#: src/Resources.vala:118 +#: data/ui/direct.ui:127 data/ui/photo.ui:216 src/CollectionPage.vala:117 +#: src/Resources.vala:119 msgid "Flip Verti_cally" msgstr "Apsukti verti_kaliai" -#: data/ui/direct.ui:133 data/ui/photo.ui:224 +#: data/ui/direct.ui:133 data/ui/photo.ui:222 msgid "T_ools" msgstr "Į_rankiai" -#: data/ui/direct.ui:141 data/ui/photo.ui:232 src/Resources.vala:164 +#: data/ui/direct.ui:141 data/ui/photo.ui:230 src/Resources.vala:165 msgid "_Crop" msgstr "_Apkirpti" -#: data/ui/direct.ui:146 data/ui/photo.ui:237 -#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:168 +#: data/ui/direct.ui:146 data/ui/photo.ui:235 +#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:169 msgid "_Straighten" msgstr "Iš_tiesinti" -#: data/ui/direct.ui:151 data/ui/photo.ui:242 src/Resources.vala:172 +#: data/ui/direct.ui:151 data/ui/photo.ui:240 src/Resources.vala:173 msgid "_Red-eye" msgstr "_Raudonų akių efektas" -#: data/ui/direct.ui:156 data/ui/photo.ui:247 src/Resources.vala:176 +#: data/ui/direct.ui:156 data/ui/photo.ui:245 src/Resources.vala:177 msgid "_Adjust" msgstr "_Koreguoti" -#: data/ui/direct.ui:169 data/ui/photo.ui:341 src/Resources.vala:275 +#: data/ui/direct.ui:169 data/ui/photo.ui:339 src/Resources.vala:276 msgid "_Adjust Date and Time…" msgstr "T_aisyti datą ir laiką…" @@ -1514,30 +1522,30 @@ msgstr "T_aisyti datą ir laiką…" #: data/ui/faces.ui:430 data/ui/faces.ui:433 data/ui/import_queue.ui:65 #: data/ui/import_queue.ui:68 data/ui/import.ui:183 data/ui/import.ui:186 #: data/ui/media.ui:403 data/ui/media.ui:406 data/ui/offline.ui:180 -#: data/ui/offline.ui:183 data/ui/photo.ui:391 data/ui/photo.ui:394 +#: data/ui/offline.ui:183 data/ui/photo.ui:389 data/ui/photo.ui:392 #: data/ui/tags.ui:422 data/ui/tags.ui:425 data/ui/trash.ui:189 -#: data/ui/trash.ui:192 src/Resources.vala:128 +#: data/ui/trash.ui:192 src/Resources.vala:129 msgid "_Help" msgstr "_Pagalba" #: data/ui/direct.ui:184 data/ui/events_directory.ui:158 data/ui/event.ui:428 #: data/ui/faces.ui:438 data/ui/import_queue.ui:73 data/ui/import.ui:191 -#: data/ui/media.ui:411 data/ui/offline.ui:188 data/ui/photo.ui:399 +#: data/ui/media.ui:411 data/ui/offline.ui:188 data/ui/photo.ui:397 #: data/ui/tags.ui:430 data/ui/trash.ui:197 msgid "_Frequently Asked Questions" msgstr "_Dažniausiai užduodami klausimai" #: data/ui/direct.ui:188 data/ui/events_directory.ui:162 data/ui/event.ui:432 #: data/ui/faces.ui:442 data/ui/import_queue.ui:77 data/ui/import.ui:195 -#: data/ui/media.ui:415 data/ui/offline.ui:192 data/ui/photo.ui:403 +#: data/ui/media.ui:415 data/ui/offline.ui:192 data/ui/photo.ui:401 #: data/ui/tags.ui:434 data/ui/trash.ui:201 msgid "_Report a Problem…" msgstr "P_ranešti apie problemą…" #: data/ui/direct.ui:194 data/ui/events_directory.ui:168 data/ui/event.ui:438 #: data/ui/faces.ui:448 data/ui/import_queue.ui:83 data/ui/import.ui:201 -#: data/ui/media.ui:421 data/ui/offline.ui:198 data/ui/photo.ui:409 -#: data/ui/tags.ui:440 data/ui/trash.ui:207 src/Resources.vala:121 +#: data/ui/media.ui:421 data/ui/offline.ui:198 data/ui/photo.ui:407 +#: data/ui/tags.ui:440 data/ui/trash.ui:207 src/Resources.vala:122 msgid "_About" msgstr "_Apie" @@ -1576,14 +1584,14 @@ msgstr "_Nauja įrašyta paieška…" #: data/ui/events_directory.ui:58 data/ui/event.ui:86 data/ui/faces.ui:86 #: data/ui/import.ui:61 data/ui/media.ui:86 data/ui/offline.ui:65 -#: data/ui/tags.ui:86 data/ui/trash.ui:74 src/Resources.vala:787 +#: data/ui/tags.ui:86 data/ui/trash.ui:74 src/Resources.vala:788 msgid "Select _All" msgstr "P_asirinkti visas" #: data/ui/events_directory.ui:65 data/ui/event.ui:93 data/ui/faces.ui:93 #: data/ui/import.ui:68 data/ui/media.ui:93 data/ui/offline.ui:72 #: data/ui/photo.ui:91 data/ui/tags.ui:93 data/ui/trash.ui:81 -#: src/Resources.vala:134 src/Resources.vala:283 +#: src/Resources.vala:135 src/Resources.vala:284 msgid "_Preferences" msgstr "_Nustatymai" @@ -1650,23 +1658,23 @@ msgid "Even_ts" msgstr "Į_vykiai" #: data/ui/events_directory.ui:135 data/ui/events_directory.ui:177 -#: src/Resources.vala:208 +#: src/Resources.vala:209 msgid "_Merge Events" msgstr "_Sujungti įvykius" #: data/ui/events_directory.ui:139 data/ui/events_directory.ui:181 -#: data/ui/event.ui:393 data/ui/event.ui:588 src/Resources.vala:196 +#: data/ui/event.ui:393 data/ui/event.ui:588 src/Resources.vala:197 msgid "Re_name Event…" msgstr "Per_vadinti įvykį…" #: data/ui/event.ui:17 data/ui/faces.ui:17 data/ui/media.ui:17 -#: data/ui/photo.ui:17 data/ui/tags.ui:17 src/Resources.vala:256 +#: data/ui/photo.ui:17 data/ui/tags.ui:17 src/Resources.vala:257 msgid "_Export…" msgstr "_Eksportuoti…" #: data/ui/event.ui:74 data/ui/faces.ui:74 data/ui/media.ui:74 #: data/ui/offline.ui:58 data/ui/offline.ui:207 data/ui/offline.ui:224 -#: data/ui/photo.ui:79 data/ui/tags.ui:74 src/Resources.vala:783 +#: data/ui/photo.ui:79 data/ui/tags.ui:74 src/Resources.vala:784 msgid "R_emove From Library" msgstr "_Pašalinti iš bibliotekos" @@ -1677,36 +1685,36 @@ msgstr "_Antraštės" #: data/ui/event.ui:139 data/ui/event.ui:404 data/ui/faces.ui:139 #: data/ui/faces.ui:387 data/ui/media.ui:139 data/ui/media.ui:387 -#: data/ui/photo.ui:376 data/ui/tags.ui:139 data/ui/tags.ui:387 +#: data/ui/photo.ui:374 data/ui/tags.ui:139 data/ui/tags.ui:387 msgid "Ta_gs" msgstr "_Gairės" #: data/ui/event.ui:144 data/ui/faces.ui:144 data/ui/media.ui:144 -#: data/ui/photo.ui:122 data/ui/tags.ui:144 src/Resources.vala:245 +#: data/ui/photo.ui:122 data/ui/tags.ui:144 src/Resources.vala:246 msgid "_Ratings" msgstr "Įve_rtinimai" #: data/ui/event.ui:151 data/ui/faces.ui:151 data/ui/import.ui:111 #: data/ui/media.ui:151 data/ui/offline.ui:108 data/ui/tags.ui:151 -#: data/ui/trash.ui:117 src/Resources.vala:248 +#: data/ui/trash.ui:117 src/Resources.vala:249 msgid "_Filter Photos" msgstr "_Filtruoti nuotraukas" #: data/ui/event.ui:184 data/ui/faces.ui:184 data/ui/import.ui:144 #: data/ui/media.ui:184 data/ui/offline.ui:141 data/ui/search_bar.ui:18 -#: data/ui/tags.ui:184 data/ui/trash.ui:150 src/Resources.vala:241 +#: data/ui/tags.ui:184 data/ui/trash.ui:150 src/Resources.vala:242 msgid "_All Photos" msgstr "_Visos nuotraukos" #: data/ui/event.ui:190 data/ui/faces.ui:190 data/ui/import.ui:150 #: data/ui/media.ui:190 data/ui/offline.ui:147 data/ui/search_bar.ui:12 -#: data/ui/tags.ui:190 data/ui/trash.ui:156 src/Resources.vala:238 +#: data/ui/tags.ui:190 data/ui/trash.ui:156 src/Resources.vala:239 msgid "All + _Rejected" msgstr "Visos + _atmestos" #: data/ui/event.ui:196 data/ui/faces.ui:196 data/ui/import.ui:156 #: data/ui/media.ui:196 data/ui/offline.ui:153 data/ui/search_bar.ui:6 -#: data/ui/tags.ui:196 data/ui/trash.ui:162 src/Resources.vala:234 +#: data/ui/tags.ui:196 data/ui/trash.ui:162 src/Resources.vala:235 msgid "Rejected _Only" msgstr "Tik _atmestos" @@ -1745,21 +1753,21 @@ msgstr "_Mažėjančiai" msgid "_Photos" msgstr "_Nuotraukos" -#: data/ui/event.ui:373 data/ui/event.ui:580 src/Resources.vala:199 +#: data/ui/event.ui:373 data/ui/event.ui:580 src/Resources.vala:200 msgid "Make _Key Photo for Event" msgstr "Padaryti _pagrindine įvykio nuotrauka" #: data/ui/event.ui:382 data/ui/faces.ui:376 data/ui/media.ui:376 -#: data/ui/tags.ui:376 src/Resources.vala:202 +#: data/ui/tags.ui:376 src/Resources.vala:203 msgid "_New Event" msgstr "_Naujas įvykis" -#: data/ui/event.ui:592 src/Resources.vala:272 +#: data/ui/event.ui:592 src/Resources.vala:273 msgid "Edit Event _Comment…" msgstr "Keisit įvykio _komentarą…" -#: data/ui/faces.ui:403 src/faces/FacesBranch.vala:87 src/Resources.vala:300 -#: src/Resources.vala:301 +#: data/ui/faces.ui:403 src/faces/FacesBranch.vala:87 src/Resources.vala:301 +#: src/Resources.vala:302 msgid "Faces" msgstr "Veidai" @@ -1788,31 +1796,32 @@ msgid "_Log in" msgstr "_Prisijungti" #: data/ui/multitextentrydialog.ui:25 data/ui/slideshow_settings.ui:38 -#: data/ui/textentrydialog.ui:19 src/AppWindow.vala:513 src/AppWindow.vala:534 +#: data/ui/textentrydialog.ui:19 src/AppWindow.vala:517 src/AppWindow.vala:538 #: src/data_imports/DataImportsUI.vala:302 #: src/data_imports/DataImportsUI.vala:420 src/Dialogs.vala:20 #: src/Dialogs.vala:28 src/Dialogs.vala:56 src/Dialogs.vala:760 -#: src/Dialogs.vala:783 src/Exporter.vala:348 src/ProfileBrowser.vala:64 -#: src/ProfileBrowser.vala:92 src/publishing/PublishingUI.vala:174 -#: src/publishing/PublishingUI.vala:403 src/Resources.vala:123 +#: src/Dialogs.vala:783 src/Exporter.vala:359 src/ProfileBrowser.vala:68 +#: src/ProfileBrowser.vala:100 src/publishing/PublishingUI.vala:174 +#: src/publishing/PublishingUI.vala:403 src/Resources.vala:124 msgid "_Cancel" msgstr "_Atšaukti" #: data/ui/multitextentrydialog.ui:40 data/ui/slideshow_settings.ui:52 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1052 -#: src/ProfileBrowser.vala:64 src/ProfileBrowser.vala:92 src/Resources.vala:132 +#: src/ProfileBrowser.vala:68 src/ProfileBrowser.vala:100 +#: src/Resources.vala:133 msgid "_OK" msgstr "_Gerai" -#: data/ui/offline.ui:221 src/Resources.vala:771 +#: data/ui/offline.ui:221 src/Resources.vala:772 msgid "Remove the selected photos from the library" msgstr "Pašalinti pasirinktas nuotraukas iš bibliotekos" -#: data/ui/photo_context.ui:17 src/Resources.vala:279 +#: data/ui/photo_context.ui:17 src/Resources.vala:280 msgid "_Add Tags…" msgstr "Pri_dėti žymų…" -#: data/ui/photo_context.ui:135 src/Resources.vala:290 +#: data/ui/photo_context.ui:135 src/Resources.vala:291 msgid "Send T_o…" msgstr "Siųsti…" @@ -1820,11 +1829,11 @@ msgstr "Siųsti…" msgid "S_lideshow" msgstr "S_kaidrių rodymas" -#: data/ui/photo.ui:260 src/CollectionPage.vala:122 src/Resources.vala:156 +#: data/ui/photo.ui:258 src/CollectionPage.vala:122 src/Resources.vala:157 msgid "_Copy Color Adjustments" msgstr "_Kopijuoti spalvų korekcijas" -#: data/ui/photo.ui:265 src/CollectionPage.vala:125 src/Resources.vala:160 +#: data/ui/photo.ui:263 src/CollectionPage.vala:125 src/Resources.vala:161 msgid "_Paste Color Adjustments" msgstr "Į_dėti spalvų korekcijas" @@ -1993,7 +2002,7 @@ msgid "Search" msgstr "Ieškoti" #: data/ui/saved_search_dialog.ui:26 src/ProfileBrowser.vala:20 -#: src/ProfileBrowser.vala:209 +#: src/ProfileBrowser.vala:221 msgid "Cancel" msgstr "Atšaukti" @@ -2025,19 +2034,19 @@ msgstr "jokios" msgid "of the following:" msgstr "vieną iš:" -#: data/ui/savedsearch.ui:6 src/Resources.vala:391 +#: data/ui/savedsearch.ui:6 src/Resources.vala:392 msgid "Re_name…" msgstr "Per_vadinti…" -#: data/ui/savedsearch.ui:10 src/Resources.vala:390 +#: data/ui/savedsearch.ui:10 src/Resources.vala:391 msgid "_Edit…" msgstr "K_eisti…" #: data/ui/savedsearch.ui:14 data/ui/tags.ui:460 data/ui/trash.ui:63 #: data/ui/trash.ui:216 data/ui/trash.ui:258 src/Dialogs.vala:20 #: src/Dialogs.vala:28 src/Dialogs.vala:56 src/Dialogs.vala:728 -#: src/Resources.vala:124 src/Resources.vala:305 src/Resources.vala:336 -#: src/Resources.vala:389 src/Resources.vala:769 +#: src/Resources.vala:125 src/Resources.vala:306 src/Resources.vala:337 +#: src/Resources.vala:390 src/Resources.vala:770 msgid "_Delete" msgstr "_Ištrinti" @@ -2079,7 +2088,7 @@ msgstr "Kiek ilgai kiekviena nuotrauka yra rodoma darbalaukio fone" msgid "New _Tag…" msgstr "Nauja _žyma…" -#: data/ui/slideshow_settings.ui:21 src/SlideshowPage.vala:159 +#: data/ui/slideshow_settings.ui:21 src/SlideshowPage.vala:174 msgid "Settings" msgstr "Nustatymai" @@ -2107,15 +2116,15 @@ msgstr "Laikas (sekundėmis), kiek trunka perėjimai tarp nuotraukų" msgid "Show t_itle" msgstr "Rodyti _pavadinimą" -#: data/ui/slideshow_settings.ui:221 data/ui/slideshow_settings.ui:232 +#: data/ui/slideshow_settings.ui:237 data/ui/slideshow_settings.ui:248 msgid "seconds" -msgstr "sek." +msgstr "sekundės" -#: data/ui/tags.ui:450 src/Resources.vala:130 src/Resources.vala:338 +#: data/ui/tags.ui:450 src/Resources.vala:131 src/Resources.vala:339 msgid "_New" msgstr "_Nauja" -#: data/ui/tags.ui:456 src/Resources.vala:306 src/Resources.vala:348 +#: data/ui/tags.ui:456 src/Resources.vala:307 src/Resources.vala:349 msgid "_Rename…" msgstr "Pe_rvadinti…" @@ -2124,21 +2133,21 @@ msgid "label" msgstr "etiketė" #: data/ui/trash.ui:68 data/ui/trash.ui:221 data/ui/trash.ui:273 -#: src/Resources.vala:773 +#: src/Resources.vala:774 msgid "_Restore" msgstr "_Grąžinti" -#: data/ui/trash.ui:255 src/Resources.vala:770 +#: data/ui/trash.ui:255 src/Resources.vala:771 msgid "Remove the selected photos from the trash" msgstr "Ištrinti pasirinktas nuotraukas iš šiukšlinės" -#: data/ui/trash.ui:270 src/Resources.vala:774 +#: data/ui/trash.ui:270 src/Resources.vala:775 msgid "Move the selected photos back into the library" msgstr "Perkelti pasirinktas nuotraukas atgal į biblioteką" #: data/ui/trash.ui:285 msgid "Delete all photos in the trash" -msgstr "Ištrinti visas šiukšlinėje esančias nuotraukas " +msgstr "Ištrinti visas šiukšlinėje esančias nuotraukas" #: data/ui/trash.ui:288 src/library/LibraryWindow.vala:577 msgid "Empty Trash" @@ -2157,31 +2166,14 @@ msgstr "" "Jūs turėsite suteikti leidimą Shotwell Connect jungtis prie Jūsų Flickr " "paskyros." -#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:148 +#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:88 msgid "Preparing for login…" msgstr "Ruošiamasi prisijungti…" -#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:203 -msgid "Flickr authorization failed" -msgstr "Flickr autorizacijos klaida" - -#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:210 +#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:161 msgid "Verifying authorization…" msgstr "Tikrinama autorizacija…" -#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:173 -msgid "" -"You have already logged in and out of a Google service during this Shotwell " -"session.\n" -"\n" -"To continue publishing to Google services, quit and restart Shotwell, then " -"try publishing again." -msgstr "" -"Šiame Shotwell seanse jau prisijungėte ir atsijungėte nuo Google tarnybos.\n" -"\n" -"Jei norite toliau viešinti naudodami Google tarnybas, paleiskite Shotwell " -"išnaujo ir vėl bandykite viešinti." - #: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:30 msgid "" "You are not currently logged into YouTube.\n" @@ -2289,13 +2281,16 @@ msgstr "Netinkamas naudotojo vardas arba slaptažodis" msgid "Could not load UI: %s" msgstr "Nepavyko įkelti naudotojo sąsajos: %s" -#: plugins/common/Resources.vala:12 +#: plugins/common/Resources.vala:12 src/plugins/SpitInterfaces.vala:176 msgid "Visit the Shotwell home page" msgstr "Aplankyti Shotwell internetinę svetainę" -#: plugins/common/Resources.vala:31 src/AppWindow.vala:583 +#: plugins/common/Resources.vala:31 src/AppWindow.vala:599 +#: src/plugins/SpitInterfaces.vala:177 msgid "translator-credits" msgstr "" +"Išvertė:\n" +"Aurimas Černius <aurisc4@gmail.com>\n" "Žygimantas Beručka <zygis@gnome.org>\n" "Mantas Kriaučiūnas <mantas@akl.lt>\n" "Moo <hazap@hotmail.com>" @@ -2386,7 +2381,7 @@ msgstr "_Atsijungti" #: plugins/shotwell-publishing/google_photos_publishing_options_pane.ui:195 #: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:122 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:94 -#: src/CollectionPage.vala:82 src/PhotoPage.vala:2486 +#: src/CollectionPage.vala:82 src/PhotoPage.vala:2495 msgid "_Publish" msgstr "_Skelbti" @@ -2543,7 +2538,7 @@ msgid "Google+ (2048 × 1536 pixels)" msgstr "Google+ (2048 × 1536 pikselių)" #: plugins/shotwell-publishing/PhotosPublishingPane.vala:21 -#: src/editing_tools/EditingTools.vala:742 +#: src/editing_tools/EditingTools.vala:746 msgid "Original Size" msgstr "Pradinis dydis" @@ -2827,39 +2822,39 @@ msgstr "Nepavyko sukurti duomenų aplanko %s: %s" msgid "Pictures" msgstr "Paveikslėliai" -#: src/AppDirs.vala:205 +#: src/AppDirs.vala:211 #, c-format msgid "Unable to create temporary directory %s: %s" msgstr "Nepavyko sukurti laikinojo aplanko %s: %s" -#: src/AppDirs.vala:222 src/AppDirs.vala:253 +#: src/AppDirs.vala:229 src/AppDirs.vala:260 #, c-format msgid "Unable to create data subdirectory %s: %s" msgstr "Nepavyko sukurti duomenų poaplankio %s: %s" -#: src/AppDirs.vala:235 +#: src/AppDirs.vala:242 #, c-format msgid "Could not make directory %s writable" msgstr "Nepavyko padaryti katalogo %s įrašomo" -#: src/AppDirs.vala:238 +#: src/AppDirs.vala:245 #, c-format msgid "Could not make directory %s writable: %s" msgstr "Nepavyko padaryti katalogo %s įrašomo: %s" -#: src/AppWindow.vala:47 +#: src/AppWindow.vala:52 msgid "Pin Toolbar" msgstr "Prisegti įrankinę" -#: src/AppWindow.vala:48 +#: src/AppWindow.vala:53 msgid "Pin the toolbar open" msgstr "Prisegti atvertą įrankinę" -#: src/AppWindow.vala:53 +#: src/AppWindow.vala:58 msgid "Leave fullscreen" msgstr "Išjungti viso ekrano veikseną" -#: src/AppWindow.vala:560 +#: src/AppWindow.vala:571 #, c-format msgid "" "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot " @@ -2872,21 +2867,21 @@ msgstr "" "\n" "%s" -#: src/AppWindow.vala:580 +#: src/AppWindow.vala:596 msgid "Visit the Shotwell web site" msgstr "Aplankyti Shotwell internetinę svetainę" -#: src/AppWindow.vala:592 +#: src/AppWindow.vala:609 #, c-format msgid "Unable to display help: %s" msgstr "Nepavyko parodyti žinyno: %s" -#: src/AppWindow.vala:600 +#: src/AppWindow.vala:617 #, c-format msgid "Unable to navigate to bug database: %s" msgstr "Nepavyksta nueiti į klaidų duomenų bazę: %s" -#: src/AppWindow.vala:608 +#: src/AppWindow.vala:625 #, c-format msgid "Unable to display FAQ: %s" msgstr "Nepavyko parodyti DUK: %s" @@ -2986,18 +2981,18 @@ msgstr "Slėpti jau importuotas nuotraukas" msgid "Only display photos that have not been imported" msgstr "Rodyti tik neimportuotas nuotraukas" -#: src/camera/ImportPage.vala:839 +#: src/camera/ImportPage.vala:843 msgid "The camera seems to be empty. No photos/videos found to import" msgstr "" "Atrodo fotoaparatas yra tuščias. Nerasta nuotraukų ar vaizdo įrašų " "importavimui" -#: src/camera/ImportPage.vala:843 +#: src/camera/ImportPage.vala:847 msgid "No new photos/videos found on camera" msgstr "Fotoaparate nerasta nuotraukų/vaizdo įrašų" #. it's mounted, offer to unmount for the user -#: src/camera/ImportPage.vala:996 +#: src/camera/ImportPage.vala:1000 msgid "" "Shotwell needs to unmount the camera from the filesystem in order to access " "it. Continue?" @@ -3005,15 +3000,15 @@ msgstr "" "Norint suteikti Shotwell prieigą prie fotoaparato, reikia atjungti " "fotoaparatą nuo failų sistemos. Tęsti?" -#: src/camera/ImportPage.vala:1002 +#: src/camera/ImportPage.vala:1006 msgid "_Unmount" msgstr "_Atjungti" -#: src/camera/ImportPage.vala:1007 +#: src/camera/ImportPage.vala:1011 msgid "Please unmount the camera." msgstr "Atjunkite fotoaparatą." -#: src/camera/ImportPage.vala:1012 +#: src/camera/ImportPage.vala:1016 msgid "" "The camera is locked by another application. Shotwell can only access the " "camera when it’s unlocked. Please close any other application using the " @@ -3023,11 +3018,11 @@ msgstr "" "fotoaparato tik, kai jis neužblokuotas. Užverkite visas kitas programas, " "naudojančias fotoaparatą, ir bandykite dar kartą." -#: src/camera/ImportPage.vala:1022 +#: src/camera/ImportPage.vala:1026 msgid "Please close any other application using the camera." msgstr "Užverkite visas kitas fotoaparatą naudojančias programas." -#: src/camera/ImportPage.vala:1027 +#: src/camera/ImportPage.vala:1031 #, c-format msgid "" "Unable to fetch previews from the camera:\n" @@ -3036,33 +3031,33 @@ msgstr "" "Nepavyko iš fotoaparato gauti peržiūrų:\n" "%s" -#: src/camera/ImportPage.vala:1044 +#: src/camera/ImportPage.vala:1048 msgid "Unmounting…" msgstr "Atjungiama…" -#: src/camera/ImportPage.vala:1137 +#: src/camera/ImportPage.vala:1141 msgid "Connecting to camera, please wait…" msgstr "Jungiamasi prie fotoaparato, palaukite…" -#: src/camera/ImportPage.vala:1169 +#: src/camera/ImportPage.vala:1173 msgid "Starting import, please wait…" msgstr "Pradedamas importas, palaukite…" -#: src/camera/ImportPage.vala:1175 +#: src/camera/ImportPage.vala:1179 msgid "Fetching photo information" msgstr "Gaunama nuotraukų informacija" -#: src/camera/ImportPage.vala:1543 +#: src/camera/ImportPage.vala:1544 #, c-format msgid "Fetching preview for %s" msgstr "Gaunama %s peržiūra" -#: src/camera/ImportPage.vala:1652 +#: src/camera/ImportPage.vala:1653 #, c-format msgid "Unable to lock camera: %s" msgstr "Nepavyko užrakinti fotoaparato: %s" -#: src/camera/ImportPage.vala:1737 +#: src/camera/ImportPage.vala:1738 #, c-format msgid "Delete this photo from camera?" msgid_plural "Delete these %d photos from camera?" @@ -3070,7 +3065,7 @@ msgstr[0] "Ištrinti šią %d nuotrauką iš fotoaparato?" msgstr[1] "Ištrinti šias %d nuotraukas iš fotoaparato?" msgstr[2] "Ištrinti šias %d nuotraukų iš fotoaparato?" -#: src/camera/ImportPage.vala:1740 +#: src/camera/ImportPage.vala:1741 #, c-format msgid "Delete this video from camera?" msgid_plural "Delete these %d videos from camera?" @@ -3078,7 +3073,7 @@ msgstr[0] "Pašalinti šiuos %d aizdo įrašus iš kameros?" msgstr[1] "Pašalinti šiuos %d vaizdo įrašų iš kameros?" msgstr[2] "Pašalinti šiuos %d vaizdo įrašų iš kameros?" -#: src/camera/ImportPage.vala:1743 +#: src/camera/ImportPage.vala:1744 #, c-format msgid "Delete this photo/video from camera?" msgid_plural "Delete these %d photos/videos from camera?" @@ -3086,7 +3081,7 @@ msgstr[0] "Pašalinti šias %d nuotraukas ar vaizdo įrašus iš fotoaparato?" msgstr[1] "Pašalinti šias %d nuotraukų ar vaizdo įrašų iš fotoaparato?" msgstr[2] "Pašalinti šias %d nuotraukų ar vaizdo įrašų iš fotoaparato?" -#: src/camera/ImportPage.vala:1746 +#: src/camera/ImportPage.vala:1747 #, c-format msgid "Delete these files from camera?" msgid_plural "Delete these %d files from camera?" @@ -3094,15 +3089,15 @@ msgstr[0] "Ištrinti šį %d failą iš kameros?" msgstr[1] "Ištrinti šiuos %d failus iš kameros?" msgstr[2] "Ištrinti šiuos %d failų iš kameros?" -#: src/camera/ImportPage.vala:1754 src/Dialogs.vala:727 +#: src/camera/ImportPage.vala:1755 src/Dialogs.vala:727 msgid "_Keep" msgstr "_Palikti" -#: src/camera/ImportPage.vala:1773 +#: src/camera/ImportPage.vala:1774 msgid "Removing photos/videos from camera" msgstr "Nuotraukos ir video šalinamos iš fotoaparato (kameros)" -#: src/camera/ImportPage.vala:1777 +#: src/camera/ImportPage.vala:1778 #, c-format msgid "Unable to delete %d photo/video from the camera due to errors." msgid_plural "Unable to delete %d photos/videos from the camera due to errors." @@ -3121,17 +3116,17 @@ msgstr "Nėra nuotraukų/vaizdo įrašų" msgid "No photos/videos found which match the current filter" msgstr "Nėra dabartinį filtrą atitinkančių nuotraukų ar vaizdo įrašų" -#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85 -#: src/PhotoPage.vala:2481 src/Resources.vala:136 +#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:86 +#: src/PhotoPage.vala:2490 src/Resources.vala:137 msgid "_Print" msgstr "S_pausdinti" -#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90 -#: src/PhotoPage.vala:2491 src/Resources.vala:186 +#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:91 +#: src/PhotoPage.vala:2500 src/Resources.vala:187 msgid "Set as _Desktop Background" msgstr "Nustatyti kaip _darbalaukio foną" -#: src/CollectionPage.vala:92 src/Resources.vala:252 +#: src/CollectionPage.vala:92 src/Resources.vala:253 msgid "_Duplicate" msgstr "_Sukurti kopiją" @@ -3143,45 +3138,45 @@ msgstr "Visame ekrane" msgid "Adjust Date and Time…" msgstr "Taisyti datą ir laiką…" -#: src/CollectionPage.vala:149 src/Resources.vala:133 +#: src/CollectionPage.vala:149 src/Resources.vala:134 msgid "_Play" msgstr "R_odyti" -#: src/CollectionPage.vala:410 +#: src/CollectionPage.vala:414 msgid "Export Photo/Video" msgid_plural "Export Photos/Videos" msgstr[0] "Eksportuoti nuotraukas ar vaizdo įrašus" msgstr[1] "Eksportuoti nuotraukas ar vaizdo įrašus" msgstr[2] "Eksportuoti nuotraukas ar vaizdo įrašus" -#: src/CollectionPage.vala:412 +#: src/CollectionPage.vala:416 msgid "Export Photo" msgid_plural "Export Photos" msgstr[0] "Eksportuoti nuotraukas" msgstr[1] "Eksportuoti nuotraukas" msgstr[2] "Eksportuoti nuotraukas" -#: src/CollectionPage.vala:499 src/CollectionPage.vala:515 +#: src/CollectionPage.vala:503 src/CollectionPage.vala:519 msgid "Rotating" msgstr "Pasukama" -#: src/CollectionPage.vala:499 src/CollectionPage.vala:515 +#: src/CollectionPage.vala:503 src/CollectionPage.vala:519 msgid "Undoing Rotate" msgstr "Atšaukiamas pasukimas" -#: src/CollectionPage.vala:524 +#: src/CollectionPage.vala:528 msgid "Flipping Horizontally" msgstr "Apsukama horizontaliai" -#: src/CollectionPage.vala:525 +#: src/CollectionPage.vala:529 msgid "Undoing Flip Horizontally" msgstr "Atšaukiamas horizontalus apsukimas" -#: src/CollectionPage.vala:534 +#: src/CollectionPage.vala:538 msgid "Flipping Vertically" msgstr "Apsukama vertikaliai" -#: src/CollectionPage.vala:535 +#: src/CollectionPage.vala:539 msgid "Undoing Flip Vertically" msgstr "Atšaukiamas vertikalus apsukimas" @@ -3484,7 +3479,7 @@ msgstr "PM" #: src/dialogs/AdjustDateTimeDialog.vala:80 msgid "24 Hr" -msgstr "24 val." +msgstr "24 val" #: src/dialogs/AdjustDateTimeDialog.vala:95 msgid "_Shift photos/videos by the same amount" @@ -3624,7 +3619,7 @@ msgstr "Metai%sMėnuo-Diena" msgid "Year-Month-Day" msgstr "Metai-Mėnuo-Diena" -#: src/dialogs/Preferences.vala:123 src/editing_tools/EditingTools.vala:767 +#: src/dialogs/Preferences.vala:123 src/editing_tools/EditingTools.vala:771 msgid "Custom" msgstr "Pasirinktinis" @@ -3712,7 +3707,7 @@ msgstr[2] "Bus pašalinta žyma „%s“ iš %d nuotraukų. Tęsti?" msgid "Export Video" msgstr "Eksportuoti video" -#: src/Dialogs.vala:70 src/PhotoPage.vala:3016 +#: src/Dialogs.vala:70 src/PhotoPage.vala:3025 msgctxt "Dialog Title" msgid "Export Photo" msgstr "Eksportuoti nuotrauką" @@ -3778,9 +3773,9 @@ msgstr "Importo rezultatų ataskaita" #, c-format msgid "Attempted to import %d file." msgid_plural "Attempted to import %d files." -msgstr[0] "Bandyta importuoti %d failą" -msgstr[1] "Bandyta importuoti %d failus" -msgstr[2] "Bandyta importuoti %d failų" +msgstr[0] "Bandyta importuoti %d failą." +msgstr[1] "Bandyta importuoti %d failus." +msgstr[2] "Bandyta importuoti %d failų." #: src/Dialogs.vala:223 #, c-format @@ -4137,7 +4132,7 @@ msgstr "Neimportuota jokių nuotraukų ar video įrašų\n" msgid "Import Complete" msgstr "Importavimas baigtas" -#: src/Dialogs.vala:657 src/Resources.vala:197 +#: src/Dialogs.vala:657 src/Resources.vala:198 msgid "Rename Event" msgstr "Pervadinti įvykį" @@ -4156,7 +4151,7 @@ msgid "Title:" msgstr "Pavadinimas:" #. Dialog title -#: src/Dialogs.vala:685 src/Resources.vala:273 +#: src/Dialogs.vala:685 src/Resources.vala:274 msgid "Edit Event Comment" msgstr "Keisit įvykio komentarą" @@ -4202,7 +4197,7 @@ msgstr "_Grąžinti išorinius pakeitimus" #: src/Dialogs.vala:756 msgid "Re_vert External Edits" -msgstr "_Atstatyti išorinį redagavimą?" +msgstr "_Atstatyti išorinį redagavimą" #: src/Dialogs.vala:777 #, c-format @@ -4212,7 +4207,7 @@ msgstr[0] "Bus pašalinta %d nuotrauka iš bibliotekos. Tęsti?" msgstr[1] "Bus pašalintos %d nuotraukos iš bibliotekos. Tęsti?" msgstr[2] "Bus pašalinta %d nuotraukų iš bibliotekos. Tęsti?" -#: src/Dialogs.vala:784 src/Resources.vala:139 +#: src/Dialogs.vala:784 src/Resources.vala:140 msgid "_Remove" msgstr "_Pašalinti" @@ -4247,44 +4242,44 @@ msgstr[2] "" "\n" "Ir %d kitų." -#: src/Dialogs.vala:831 src/Dialogs.vala:868 +#: src/Dialogs.vala:835 src/Dialogs.vala:872 msgid "Tags (separated by commas):" msgstr "Žymos (atskirtos kableliais):" #. This function is used to determine whether or not files should be copied or linked when imported. #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel. -#: src/Dialogs.vala:946 +#: src/Dialogs.vala:950 msgid "" "Shotwell can copy the photos into your library folder or it can import them " "without copying." msgstr "" "Shotwell gali nukopijuoti nuotraukas į jūsų nuotraukų bibliotekos aplanką " -"arba gali jas „importuoti“ nekopijuojant" +"arba gali jas „importuoti“ nekopijuojant." -#: src/Dialogs.vala:951 +#: src/Dialogs.vala:955 msgid "Co_py Photos" msgstr "_Kopijuoti nuotraukas" -#: src/Dialogs.vala:952 +#: src/Dialogs.vala:956 msgid "_Import in Place" msgstr "_Importuoti nekopijuojant" -#: src/Dialogs.vala:953 +#: src/Dialogs.vala:957 msgid "Import to Library" msgstr "Importuoti į biblioteką" -#: src/Dialogs.vala:963 +#: src/Dialogs.vala:967 msgid "Remove From Library" msgstr "Pašalinti iš bibliotekos" -#: src/Dialogs.vala:964 +#: src/Dialogs.vala:968 msgid "Removing Photo From Library" msgid_plural "Removing Photos From Library" msgstr[0] "Šalinamos nuotraukos iš bibliotekos" msgstr[1] "Šalinamos nuotraukos iš bibliotekos" msgstr[2] "Šalinamos nuotraukos iš bibliotekos" -#: src/Dialogs.vala:978 +#: src/Dialogs.vala:982 #, c-format msgid "" "This will remove the photo/video from your Shotwell library. Would you also " @@ -4314,7 +4309,7 @@ msgstr[2] "" "\n" "Šio veiksmo nebegalėsite atšaukti." -#: src/Dialogs.vala:982 +#: src/Dialogs.vala:986 #, c-format msgid "" "This will remove the video from your Shotwell library. Would you also like " @@ -4342,7 +4337,7 @@ msgstr[2] "" "\n" "Šio veiksmo nebegalėsite atšaukti." -#: src/Dialogs.vala:986 +#: src/Dialogs.vala:990 #, c-format msgid "" "This will remove the photo from your Shotwell library. Would you also like " @@ -4370,7 +4365,7 @@ msgstr[2] "" "\n" "Šio veiksmo nebegalėsite atšaukti." -#: src/Dialogs.vala:1018 +#: src/Dialogs.vala:1022 #, c-format msgid "" "The photo or video cannot be moved to your desktop trash. Delete this file?" @@ -4387,7 +4382,7 @@ msgstr[2] "" "Ištrinti šiuos failus?" #. Alert the user that the files were not removed. -#: src/Dialogs.vala:1035 +#: src/Dialogs.vala:1039 #, c-format msgid "The photo or video cannot be deleted." msgid_plural "%d photos/videos cannot be deleted." @@ -4450,258 +4445,266 @@ msgstr "Plotis" msgid "Height" msgstr "Aukštis" -#: src/direct/DirectPhotoPage.vala:99 +#: src/direct/DirectPhotoPage.vala:100 #, c-format msgid "%s does not exist." msgstr "%s neegzistuoja." -#: src/direct/DirectPhotoPage.vala:101 +#: src/direct/DirectPhotoPage.vala:102 #, c-format msgid "%s is not a file." msgstr "%s nėra failas." -#: src/direct/DirectPhotoPage.vala:103 +#: src/direct/DirectPhotoPage.vala:104 #, c-format msgid "" "%s does not support the file format of\n" "%s." msgstr "%s nepalaiko %s failo formato." -#: src/direct/DirectPhotoPage.vala:120 +#: src/direct/DirectPhotoPage.vala:121 #, c-format msgid "Unable open photo %s. Sorry." msgstr "Nepavyko atverti nuotraukos %s. Atsiprašome." -#: src/direct/DirectPhotoPage.vala:323 +#: src/direct/DirectPhotoPage.vala:327 msgid "_Save a Copy" msgstr "Į_rašyti kopiją" -#: src/direct/DirectPhotoPage.vala:326 +#: src/direct/DirectPhotoPage.vala:330 #, c-format msgid "Lose changes to %s?" msgstr "Panaikinti %s pakeitimus?" -#: src/direct/DirectPhotoPage.vala:327 +#: src/direct/DirectPhotoPage.vala:331 msgid "Close _without Saving" msgstr "Užverti _neįrašant" -#: src/direct/DirectPhotoPage.vala:360 +#: src/direct/DirectPhotoPage.vala:367 #, c-format msgid "Error while saving to %s: %s" msgstr "Klaida rašant į %s: %s" -#: src/direct/DirectPhotoPage.vala:390 src/direct/DirectPhotoPage.vala:411 +#: src/direct/DirectPhotoPage.vala:399 src/direct/DirectPhotoPage.vala:425 msgid "Save As" msgstr "Įrašyti kaip" +#: src/direct/DirectPhotoPage.vala:414 +msgid "Supported image formats" +msgstr "Palaikomi paveikslėlių formatai" + +#: src/direct/DirectPhotoPage.vala:423 +msgid "All files" +msgstr "Visi failai" + #. verify this is a directory #: src/DirectoryMonitor.vala:891 #, c-format msgid "Unable to monitor %s: Not a directory (%s)" msgstr "Nepavyko stebėti %s: Ne aplankas (%s)" -#: src/DragAndDropHandler.vala:161 +#: src/DragAndDropHandler.vala:165 msgid "Photos cannot be exported to this directory." msgstr "Nuotraukų negalima eksportuoti į šį aplanką." -#: src/editing_tools/EditingTools.vala:651 +#: src/editing_tools/EditingTools.vala:655 msgid "Return to current photo dimensions" msgstr "Grįžti prie dabartinių nuotraukos matmenų" -#: src/editing_tools/EditingTools.vala:654 +#: src/editing_tools/EditingTools.vala:658 msgid "Set the crop for this photo" msgstr "Nurodyti šios nuotraukos apkirptiną sritį" -#: src/editing_tools/EditingTools.vala:666 +#: src/editing_tools/EditingTools.vala:670 msgid "Pivot the crop rectangle between portrait and landscape orientations" msgstr "" "Pasukti apkirpimo stačiakampį keičiant orientaciją tarp stačios ir gulsčios" -#: src/editing_tools/EditingTools.vala:739 +#: src/editing_tools/EditingTools.vala:743 msgid "Unconstrained" msgstr "Nesuvaržytas" -#: src/editing_tools/EditingTools.vala:740 +#: src/editing_tools/EditingTools.vala:744 msgid "Square" msgstr "Kvadratas" -#: src/editing_tools/EditingTools.vala:741 +#: src/editing_tools/EditingTools.vala:745 msgid "Screen" msgstr "Ekranas" -#: src/editing_tools/EditingTools.vala:743 -#: src/editing_tools/EditingTools.vala:746 -#: src/editing_tools/EditingTools.vala:756 -#: src/editing_tools/EditingTools.vala:766 +#: src/editing_tools/EditingTools.vala:747 +#: src/editing_tools/EditingTools.vala:750 +#: src/editing_tools/EditingTools.vala:760 +#: src/editing_tools/EditingTools.vala:770 msgid "-" msgstr "–" -#: src/editing_tools/EditingTools.vala:744 +#: src/editing_tools/EditingTools.vala:748 msgid "SD Video (4 ∶ 3)" msgstr "SD vaizdo įrašas (4 : 3)" -#: src/editing_tools/EditingTools.vala:745 +#: src/editing_tools/EditingTools.vala:749 msgid "HD Video (16 ∶ 9)" msgstr "HD vaizdo įrašas (16 : 9)" -#: src/editing_tools/EditingTools.vala:747 src/Printing.vala:792 +#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:792 msgid "Wallet (2 × 3 in.)" msgstr "Piniginė (2 × 3 col.)" -#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:795 +#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:795 msgid "Notecard (3 × 5 in.)" msgstr "Užrašinė (3 × 5 col.)" -#: src/editing_tools/EditingTools.vala:749 src/Printing.vala:798 +#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:798 msgid "4 × 6 in." msgstr "4 × 6 col." -#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:801 +#: src/editing_tools/EditingTools.vala:754 src/Printing.vala:801 msgid "5 × 7 in." msgstr "5 × 7 col." -#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:804 +#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:804 msgid "8 × 10 in." msgstr "8 × 10 col." -#: src/editing_tools/EditingTools.vala:752 +#: src/editing_tools/EditingTools.vala:756 msgid "Letter (8.5 × 11 in.)" msgstr "Laiškas (8.5 × 11 colių)" -#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:807 +#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:807 msgid "11 × 14 in." msgstr "11 × 14 col." -#: src/editing_tools/EditingTools.vala:754 +#: src/editing_tools/EditingTools.vala:758 msgid "Tabloid (11 × 17 in.)" msgstr "Įrėminama (11 × 17 colių)" -#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:810 +#: src/editing_tools/EditingTools.vala:759 src/Printing.vala:810 msgid "16 × 20 in." msgstr "16 × 20 col." -#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:816 +#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:816 msgid "Metric Wallet (9 × 13 cm)" msgstr "Piniginė (dešimtainė) (9 × 13 cm)" -#: src/editing_tools/EditingTools.vala:758 src/Printing.vala:819 +#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:819 msgid "Postcard (10 × 15 cm)" msgstr "Atvirukas (10 × 15 cm)" -#: src/editing_tools/EditingTools.vala:759 src/Printing.vala:822 +#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:822 msgid "13 × 18 cm" msgstr "13 × 18 cm" -#: src/editing_tools/EditingTools.vala:760 src/Printing.vala:825 +#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:825 msgid "18 × 24 cm" msgstr "18 × 24 cm" -#: src/editing_tools/EditingTools.vala:761 +#: src/editing_tools/EditingTools.vala:765 msgid "A4 (210 × 297 mm)" msgstr "A4 (210 × 297 mm)" -#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:828 +#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:828 msgid "20 × 30 cm" msgstr "20 × 30 cm" -#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:831 +#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:831 msgid "24 × 40 cm" msgstr "24 × 40 cm" -#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:834 +#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:834 msgid "30 × 40 cm" msgstr "30 × 40 cm" -#: src/editing_tools/EditingTools.vala:765 +#: src/editing_tools/EditingTools.vala:769 msgid "A3 (297 × 420 mm)" msgstr "A3 (297 × 420 mm)" -#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:407 +#: src/editing_tools/EditingTools.vala:1870 src/Properties.vala:407 msgid "Size:" msgstr "Dydis:" -#: src/editing_tools/EditingTools.vala:1873 +#: src/editing_tools/EditingTools.vala:1885 msgid "Close the red-eye tool" msgstr "Užverti raudonų akių pašalinimo priemonę" -#: src/editing_tools/EditingTools.vala:1876 +#: src/editing_tools/EditingTools.vala:1888 msgid "Remove any red-eye effects in the selected region" msgstr "Pašalinti raudonų akių efekto poveikį pasirinktoje srityje" -#: src/editing_tools/EditingTools.vala:2210 +#: src/editing_tools/EditingTools.vala:2229 #: src/editing_tools/StraightenTool.vala:102 msgid "_Reset" msgstr "_Atstatyti" #. fit both on the top line, emit and move on -#: src/editing_tools/EditingTools.vala:2224 src/Properties.vala:448 +#: src/editing_tools/EditingTools.vala:2243 src/Properties.vala:448 #: src/Properties.vala:452 src/Properties.vala:459 msgid "Exposure:" msgstr "Ekspozicija:" -#: src/editing_tools/EditingTools.vala:2233 +#: src/editing_tools/EditingTools.vala:2252 msgid "Contrast:" msgstr "Kontrastas:" -#: src/editing_tools/EditingTools.vala:2242 +#: src/editing_tools/EditingTools.vala:2261 msgid "Saturation:" msgstr "Grynis:" -#: src/editing_tools/EditingTools.vala:2251 +#: src/editing_tools/EditingTools.vala:2270 msgid "Tint:" msgstr "Atspalvis:" -#: src/editing_tools/EditingTools.vala:2261 +#: src/editing_tools/EditingTools.vala:2280 msgid "Temperature:" msgstr "Temperatūra:" -#: src/editing_tools/EditingTools.vala:2270 +#: src/editing_tools/EditingTools.vala:2289 msgid "Shadows:" msgstr "Šešėliai:" #. FIXME: Hack to make the slider the same length as the other. Find out why it is aligned #. Differently (probably because it only has positive values) -#: src/editing_tools/EditingTools.vala:2281 +#: src/editing_tools/EditingTools.vala:2300 msgid "Highlights:" msgstr "Paryškinimai:" -#: src/editing_tools/EditingTools.vala:2338 +#: src/editing_tools/EditingTools.vala:2357 msgid "Reset Colors" msgstr "Atstatyti spalvas" -#: src/editing_tools/EditingTools.vala:2338 +#: src/editing_tools/EditingTools.vala:2357 msgid "Reset all color adjustments to original" msgstr "Atstatyti visas spalvų korekcijas į pradines" -#: src/editing_tools/EditingTools.vala:2697 +#: src/editing_tools/EditingTools.vala:2716 msgid "Temperature" msgstr "Temperatūra" -#: src/editing_tools/EditingTools.vala:2709 +#: src/editing_tools/EditingTools.vala:2728 msgid "Tint" msgstr "Atspalvis" -#: src/editing_tools/EditingTools.vala:2721 +#: src/editing_tools/EditingTools.vala:2740 msgid "Contrast" msgstr "Kontrastas" -#: src/editing_tools/EditingTools.vala:2735 +#: src/editing_tools/EditingTools.vala:2754 msgid "Saturation" msgstr "Grynis" -#: src/editing_tools/EditingTools.vala:2748 +#: src/editing_tools/EditingTools.vala:2767 msgid "Exposure" msgstr "Ekspozicija" -#: src/editing_tools/EditingTools.vala:2761 +#: src/editing_tools/EditingTools.vala:2780 msgid "Shadows" msgstr "Šešėliai" -#: src/editing_tools/EditingTools.vala:2774 +#: src/editing_tools/EditingTools.vala:2793 msgid "Highlights" msgstr "Paryškinimai" -#: src/editing_tools/EditingTools.vala:2784 +#: src/editing_tools/EditingTools.vala:2803 msgid "Contrast Expansion" msgstr "Kontrasto išplėtimas" @@ -4737,57 +4740,41 @@ msgstr "Visi įvykiai" msgid "Undated" msgstr "Be datos" -#: src/events/EventsDirectoryPage.vala:242 -msgid "%Y" -msgstr "%Y" - -#: src/events/EventsDirectoryPage.vala:243 -msgid "%B" -msgstr "%B" - #. if no name, pretty up the start time #: src/Event.vala:748 #, c-format msgid "Event %s" msgstr "Įvykis %s" -#: src/Exporter.vala:236 src/Exporter.vala:291 +#: src/Exporter.vala:238 src/Exporter.vala:302 #, c-format msgid "Unable to generate a temporary file for %s: %s" msgstr "Nepavyko sukurti laikinojo failo, skirto %s: %s" -#: src/Exporter.vala:328 +#: src/Exporter.vala:339 msgid "Exporting" msgstr "Eksportuojama" -#: src/Exporter.vala:346 +#: src/Exporter.vala:357 #, c-format msgid "File %s already exists. Replace?" msgstr "Failas %s jau yra. Pakeisti?" -#: src/Exporter.vala:348 +#: src/Exporter.vala:359 msgid "_Skip" msgstr "P_raleisti" -#: src/Exporter.vala:348 +#: src/Exporter.vala:359 msgid "Rename" msgstr "Pervadinti" -#: src/Exporter.vala:348 -msgid "Rename All" -msgstr "Pervadinti viską" - -#: src/Exporter.vala:348 +#: src/Exporter.vala:359 msgid "_Replace" msgstr "_Pakeisti" -#: src/Exporter.vala:348 -msgid "Replace _All" -msgstr "Pakeisti _visus" - -#: src/Exporter.vala:348 -msgid "Export" -msgstr "Eksportuoti" +#: src/Exporter.vala:359 +msgid "Export file conflict" +msgstr "Eksportuoti failo konfliktą" #: src/faces/FacesTool.vala:114 msgid "Detect faces…" @@ -4842,7 +4829,7 @@ msgstr "Įrašyti pakeitimus ir užverti veidų įrankį" msgid "No changes to save" msgstr "Nėra pakeitimų" -#: src/faces/FacesTool.vala:951 +#: src/faces/FacesTool.vala:963 msgid "Error trying to spawn face detection program:\n" msgstr "Klaida bandant paleisti veidų aptikimo programą:\n" @@ -4917,23 +4904,24 @@ msgstr "" "Ar norite tęsti nuotraukų importą?" #. TODO: Specify which directory/file. -#: src/library/LibraryWindow.vala:772 +#. var message = ngettext("Photos cannot be imported from this folder", "Photos cannot be imported from these folders", rejected.size) +#: src/library/LibraryWindow.vala:783 msgid "Photos cannot be imported from this directory." msgstr "Nuotraukų negalima importuoti iš šio aplanko." -#: src/library/LibraryWindow.vala:995 src/library/LibraryWindow.vala:1006 +#: src/library/LibraryWindow.vala:1005 src/library/LibraryWindow.vala:1016 msgid "Updating library…" msgstr "Atnaujinama biblioteka…" -#: src/library/LibraryWindow.vala:1012 +#: src/library/LibraryWindow.vala:1022 msgid "Preparing to auto-import photos…" msgstr "Ruošiamasi automatiškai importuoti nuotraukas…" -#: src/library/LibraryWindow.vala:1017 +#: src/library/LibraryWindow.vala:1027 msgid "Auto-importing photos…" msgstr "Automatiškai impotuojamos nuotraukos…" -#: src/library/LibraryWindow.vala:1025 +#: src/library/LibraryWindow.vala:1035 msgid "Writing metadata to files…" msgstr "Metainformacija rašoma į failus…" @@ -5001,71 +4989,71 @@ msgstr "Nežinoma klaida bandant patikrinti Shotwell duomenų bazę: %s" msgid "Loading Shotwell" msgstr "Įkeliama Shotwell" -#: src/main.vala:347 +#: src/main.vala:408 msgid "Path to Shotwell’s private data" msgstr "Kelias iki Shotwell privačių duomenų" -#: src/main.vala:347 +#: src/main.vala:408 msgid "DIRECTORY" msgstr "KATALOGAS" -#: src/main.vala:348 +#: src/main.vala:409 msgid "Do not monitor library directory at runtime for changes" msgstr "Nestebėti bibliotekos aplanko pakeitimų" -#: src/main.vala:349 +#: src/main.vala:410 msgid "Don’t display startup progress meter" msgstr "Nerodyti paleidimo eigos" -#: src/main.vala:350 +#: src/main.vala:411 msgid "Show the application’s version" msgstr "Rodyti programos versiją" -#: src/main.vala:351 +#: src/main.vala:412 msgid "Start the application in fullscreen mode" msgstr "Paleisti programą viso ekrano veiksena" -#: src/main.vala:352 +#: src/main.vala:413 msgid "Print the metadata of the image file" msgstr "Spausdinti paveikslėlio failo metaduomenis" -#: src/main.vala:353 +#: src/main.vala:414 msgid "Name for a custom profile" msgstr "Pasirinktinio profilio pavadinimas" -#: src/main.vala:353 +#: src/main.vala:414 msgid "PROFILE" msgstr "PROFILIS" -#: src/main.vala:354 +#: src/main.vala:415 msgid "Start with a browser of available profiles" msgstr "Pradėti nuo esamų profilių naršyklės" -#: src/main.vala:355 +#: src/main.vala:416 msgid "If PROFILE given with --profile does not exist, create it" msgstr "Jei naudojant --profile pateikto PROFILIO nėra, jį sukurti" -#: src/main.vala:356 +#: src/main.vala:417 msgid "Show available profiles" msgstr "Rodyti visus profilius" #. init GTK (valac has already called g_threads_init()) -#: src/main.vala:387 +#: src/main.vala:458 msgid "[FILE]" msgstr "[FAILAS]" -#: src/main.vala:392 +#: src/main.vala:463 #, c-format msgid "Run “%s --help” to see a full list of available command line options.\n" msgstr "" "Norėdami pamatyti visą galimų komandų eilutės parametrų sąrašą, paleiskite " "„%s --help“.\n" -#: src/main.vala:399 +#: src/main.vala:472 msgid "Choose Shotwell's profile" msgstr "Pasirinkite Shotwell profilį" -#: src/main.vala:420 +#: src/main.vala:498 #, c-format msgid "Profile %s does not exist. Did you mean to pass --create as well?" msgstr "Profilio %s nėra. Ar taip pat norėjote nurodyti --create?" @@ -5099,31 +5087,31 @@ msgstr "" "%s" #. previous button -#: src/PhotoPage.vala:546 +#: src/PhotoPage.vala:553 msgid "Previous photo" msgstr "Ankstesnė nuotrauka" #. next button -#: src/PhotoPage.vala:552 +#: src/PhotoPage.vala:559 msgid "Next photo" msgstr "Kita nuotrauka" -#: src/PhotoPage.vala:1858 +#: src/PhotoPage.vala:1867 #, c-format msgid "Photo source file missing: %s" msgstr "Nėra nuotraukos šaltinio failo: %s" -#: src/PhotoPage.vala:2891 +#: src/PhotoPage.vala:2900 msgctxt "Dialog Title" msgid "Remove From Library" msgstr "Pašalinti iš bibliotekos" -#: src/PhotoPage.vala:2892 +#: src/PhotoPage.vala:2901 msgctxt "Dialog Title" msgid "Removing Photo From Library" msgstr "Šalinama nuotrauka iš bibliotekos" -#: src/PhotoPage.vala:3036 +#: src/PhotoPage.vala:3045 #, c-format msgid "Unable to export %s: %s" msgstr "Nepavyko eksportuoti %s: %s" @@ -5136,6 +5124,10 @@ msgstr "AVIF" msgid "BMP" msgstr "BMP" +#: src/photos/HeifSupport.vala:30 +msgid "HEIF" +msgstr "HEIF" + #: src/photos/GifSupport.vala:32 msgid "GIF" msgstr "GIF" @@ -5164,6 +5156,10 @@ msgstr "Didelė (%d%%)" msgid "Maximum (%d%%)" msgstr "Didžiausia (%d%%)" +#: src/photos/JpegXLSupport.vala:30 +msgid "JPEGXL" +msgstr "JPEGXL" + #: src/photos/PngSupport.vala:30 msgid "PNG" msgstr "PNG" @@ -5176,32 +5172,37 @@ msgstr "TIFF" msgid "WebP" msgstr "WebP" -#: src/Photo.vala:3811 +#. TRANSLATORS: "modified" here is part of a file name that was changed with another image tool outside of Shotwell. Note that there are potential issues with UTF-8 characters +#: src/Photo.vala:3812 msgid "modified" msgstr "pakeista" #. TRANSLATORS: %s is the name of an online service such as YouTube, Mastodon, ... -#: src/plugins/ManifestWidget.vala:121 +#: src/plugins/ManifestWidget.vala:122 #, c-format msgid "Manage accounts for %s" msgstr "Tvarkyti %s paskyras" -#: src/plugins/ManifestWidget.vala:134 +#: src/plugins/ManifestWidget.vala:136 msgid "Authors" msgstr "Autoriai" -#: src/plugins/ManifestWidget.vala:144 +#: src/plugins/ManifestWidget.vala:146 msgid "Version" msgstr "Versija" -#: src/plugins/ManifestWidget.vala:154 +#: src/plugins/ManifestWidget.vala:156 msgid "License" msgstr "Licencija" -#: src/plugins/ManifestWidget.vala:166 +#: src/plugins/ManifestWidget.vala:168 msgid "Website" msgstr "Tinklalapis" +#: src/plugins/SpitInterfaces.vala:173 +msgid "LGPL v2.1 or later" +msgstr "LGPL v2.1 ar vėlesnė" + #: src/Printing.vala:255 msgid "Fill the entire page" msgstr "Užpildyti visą puslapį" @@ -5253,7 +5254,7 @@ msgstr "" msgid "Create" msgstr "Sukurti" -#: src/ProfileBrowser.vala:24 src/ProfileBrowser.vala:251 +#: src/ProfileBrowser.vala:24 src/ProfileBrowser.vala:259 msgid "Create new Profile" msgstr "Sukurti naują profilį" @@ -5261,47 +5262,47 @@ msgstr "Sukurti naują profilį" msgid "Name" msgstr "Pavadinimas" -#: src/ProfileBrowser.vala:49 src/ProfileBrowser.vala:169 +#: src/ProfileBrowser.vala:49 src/ProfileBrowser.vala:177 msgid "Library Folder" msgstr "Bibliotekos aplankas" -#: src/ProfileBrowser.vala:64 +#: src/ProfileBrowser.vala:68 msgid "Choose Library Folder" msgstr "Pasirinkite bibliotekos aplanką" -#: src/ProfileBrowser.vala:76 src/ProfileBrowser.vala:179 +#: src/ProfileBrowser.vala:80 src/ProfileBrowser.vala:189 msgid "Data Folder" msgstr "Duomenų aplankas" -#: src/ProfileBrowser.vala:92 +#: src/ProfileBrowser.vala:100 msgid "Choose Data Folder" msgstr "Pasirinkite duomenų aplanką" -#: src/ProfileBrowser.vala:135 +#: src/ProfileBrowser.vala:143 msgid "This is the currently active profile" msgstr "Tai yra šiuo metu aktyvus profilis" -#: src/ProfileBrowser.vala:191 +#: src/ProfileBrowser.vala:203 msgid "Remove Profile" msgstr "Pašalinti profilį" -#: src/ProfileBrowser.vala:193 +#: src/ProfileBrowser.vala:205 msgid "Remove this profile" msgstr "Pašalinti šį profilį" -#: src/ProfileBrowser.vala:205 +#: src/ProfileBrowser.vala:217 #, c-format msgid "Remove profile “%s”" msgstr "Pašalinti profilį „%s“" -#: src/ProfileBrowser.vala:206 +#: src/ProfileBrowser.vala:218 msgid "" "None of the options will remove any of the images associated with this " "profile" msgstr "" "Nei viena parinktis nepašalins jokio su šiuo profiliu susieto paveikslėlio" -#: src/ProfileBrowser.vala:207 +#: src/ProfileBrowser.vala:219 #, c-format msgid "" "<b><span size=\"larger\">%s</span></b>\n" @@ -5310,11 +5311,11 @@ msgstr "" "<b><span size=\"larger\">%s</span></b>\n" "<span weight=\"light\">%s</span>" -#: src/ProfileBrowser.vala:209 +#: src/ProfileBrowser.vala:221 msgid "Remove profile and files" msgstr "Pašalinti profilį bei failus" -#: src/ProfileBrowser.vala:209 +#: src/ProfileBrowser.vala:221 msgid "Remove profile only" msgstr "Pašalina tik profilį" @@ -5465,12 +5466,12 @@ msgstr "Ruošiamasi nusiuntimui" msgid "Uploading %d of %d" msgstr "Nusiunčiama %d iš %d" -#: src/publishing/PublishingPluginHost.vala:85 +#: src/publishing/PublishingPluginHost.vala:93 #, c-format msgid "Publishing to %s can’t continue because an error occurred:" msgstr "Viešinimas %s negali būti tęsiamas dėl klaidos:" -#: src/publishing/PublishingPluginHost.vala:88 +#: src/publishing/PublishingPluginHost.vala:96 msgid "To try publishing to another service, select one from the above menu." msgstr "" "Pabandykite skelbti naudodami kitą tarnybą, pasirinkite aukščiau esančiame " @@ -5550,372 +5551,372 @@ msgstr[2] "Pasirinktos nuotraukos sėkmingai paskelbtos." msgid "The selected photos/videos were successfully published." msgstr "Pasirinktos nuotraukos bei vaizdo įrašai buvo sėkmingai paskelbtos." -#: src/Resources.vala:107 +#: src/Resources.vala:108 msgid "Rotate Right" msgstr "Pasukti dešinėn" -#: src/Resources.vala:112 +#: src/Resources.vala:113 msgid "Rotate Left" msgstr "Pasukti kairėn" -#: src/Resources.vala:113 +#: src/Resources.vala:114 msgid "Rotate the photos left" msgstr "Pasukti nuotraukas kairėn" -#: src/Resources.vala:116 +#: src/Resources.vala:117 msgid "Flip Horizontally" msgstr "Apsukti horizontaliai" -#: src/Resources.vala:119 +#: src/Resources.vala:120 msgid "Flip Vertically" msgstr "Apsukti vertikaliai" -#: src/Resources.vala:122 +#: src/Resources.vala:123 msgid "_Apply" msgstr "T_aikyti" -#: src/Resources.vala:126 +#: src/Resources.vala:127 msgid "_Forward" msgstr "_Pirmyn" -#: src/Resources.vala:129 +#: src/Resources.vala:130 msgid "Leave _Fullscreen" msgstr "Išjungti _viso ekrano veikseną" -#: src/Resources.vala:131 +#: src/Resources.vala:132 msgid "_Next" msgstr "_Kita" -#: src/Resources.vala:135 +#: src/Resources.vala:136 msgid "_Previous" msgstr "_Ankstesnė" -#: src/Resources.vala:138 +#: src/Resources.vala:139 msgid "_Refresh" msgstr "Įke_lti iš naujo" -#: src/Resources.vala:140 +#: src/Resources.vala:141 msgid "_Revert" msgstr "_Atstatyti" -#: src/Resources.vala:142 +#: src/Resources.vala:143 msgid "Save _As" msgstr "Įrašyti k_aip" -#: src/Resources.vala:143 +#: src/Resources.vala:144 msgid "Sort _Ascending" msgstr "Rikiuoti _didėjančiai" -#: src/Resources.vala:144 +#: src/Resources.vala:145 msgid "Sort _Descending" msgstr "Rikiuoti _mažėjančiai" -#: src/Resources.vala:145 +#: src/Resources.vala:146 msgid "_Stop" msgstr "_Stabdyti" -#: src/Resources.vala:146 +#: src/Resources.vala:147 msgid "_Undelete" msgstr "_Grąžinti pašalintą" -#: src/Resources.vala:147 +#: src/Resources.vala:148 msgid "_Normal Size" msgstr "_Normalus dydis" -#: src/Resources.vala:148 +#: src/Resources.vala:149 msgid "Best _Fit" msgstr "Geriausias pri_derinimas" -#: src/Resources.vala:157 +#: src/Resources.vala:158 msgid "Copy Color Adjustments" msgstr "Kopijuoti spalvų korekcijas" -#: src/Resources.vala:158 +#: src/Resources.vala:159 msgid "Copy the color adjustments applied to the photo" msgstr "Kopijuoti nuotraukai pritaikytas spalvų korekcijas" -#: src/Resources.vala:161 +#: src/Resources.vala:162 msgid "Paste Color Adjustments" msgstr "Įdėti spalvų korekcijas" -#: src/Resources.vala:162 +#: src/Resources.vala:163 msgid "Apply copied color adjustments to the selected photos" msgstr "Pritaikyti nukopijuotas spalvų korekcijas pažymėtoms nuotraukoms" -#: src/Resources.vala:165 +#: src/Resources.vala:166 msgid "Crop" msgstr "Apkirpti" -#: src/Resources.vala:166 +#: src/Resources.vala:167 msgid "Crop the photo’s size" msgstr "Apkirpti nuotraukos dydį" -#: src/Resources.vala:169 +#: src/Resources.vala:170 msgid "Straighten" msgstr "Ištiesinti" -#: src/Resources.vala:170 +#: src/Resources.vala:171 msgid "Straighten the photo" msgstr "Ištiesinti nuotrauką" -#: src/Resources.vala:173 +#: src/Resources.vala:174 msgid "Red-eye" msgstr "Raudonų akių efektas" -#: src/Resources.vala:174 +#: src/Resources.vala:175 msgid "Reduce or eliminate any red-eye effects in the photo" msgstr "Sumažinti arba panaikinti raudonų akių efektą nuotraukoje" -#: src/Resources.vala:177 +#: src/Resources.vala:178 msgid "Adjust" msgstr "Koreguoti" -#: src/Resources.vala:178 +#: src/Resources.vala:179 msgid "Adjust the photo’s color and tone" msgstr "Koreguoti nuotraukos spalvą ir toną" -#: src/Resources.vala:181 +#: src/Resources.vala:182 msgid "Revert to Original" msgstr "Atstatyti originalią" -#: src/Resources.vala:183 +#: src/Resources.vala:184 msgid "Revert External E_dits" msgstr "Panaikinti išorinius _pakeitimus" -#: src/Resources.vala:184 +#: src/Resources.vala:185 msgid "Revert to the master photo" msgstr "Atstatyti pagrindinę nuotrauką" -#: src/Resources.vala:187 +#: src/Resources.vala:188 msgid "Set selected image to be the new desktop background" msgstr "Padaryti pasirinktą paveikslėlį naujuoju darbalaukio fonu" -#: src/Resources.vala:188 +#: src/Resources.vala:189 msgid "Set as _Desktop Slideshow…" -msgstr "Nustatyti kaip _darbalaukio fonų demonstraciją" +msgstr "Nustatyti kaip _darbalaukio fonų demonstraciją…" -#: src/Resources.vala:191 +#: src/Resources.vala:192 msgid "Undo" msgstr "Atšaukti" -#: src/Resources.vala:194 +#: src/Resources.vala:195 msgid "Redo" msgstr "Pakartoti" -#: src/Resources.vala:200 +#: src/Resources.vala:201 msgid "Make Key Photo for Event" msgstr "Padaryti pagrindine įvykio nuotrauka" -#: src/Resources.vala:203 +#: src/Resources.vala:204 msgid "New Event" msgstr "Naujas įvykis" -#: src/Resources.vala:205 +#: src/Resources.vala:206 msgid "Move Photos" msgstr "Perkelti nuotraukas" -#: src/Resources.vala:206 +#: src/Resources.vala:207 msgid "Move photos to an event" msgstr "Perkelti nuotraukas į įvykį" -#: src/Resources.vala:209 +#: src/Resources.vala:210 msgid "Merge" msgstr "Sujungti" -#: src/Resources.vala:210 +#: src/Resources.vala:211 msgid "Combine events into a single event" msgstr "Sujungti įvykius į vieną" -#: src/Resources.vala:213 +#: src/Resources.vala:214 msgid "Set Rating" msgstr "Pridėti vertinimą" -#: src/Resources.vala:214 +#: src/Resources.vala:215 msgid "Change the rating of your photo" msgstr "Pakeisti nuotraukos įvertinimą" -#: src/Resources.vala:217 +#: src/Resources.vala:218 msgid "Increase Rating" msgstr "Padidinti įvertinimą" -#: src/Resources.vala:220 +#: src/Resources.vala:221 msgid "Decrease Rating" msgstr "Sumažinti įvertinimą" -#: src/Resources.vala:223 +#: src/Resources.vala:224 msgid "Unrated" msgstr "Neįvertinta" -#: src/Resources.vala:224 +#: src/Resources.vala:225 msgid "Rate Unrated" msgstr "Pašalinti įvertinimą" -#: src/Resources.vala:225 +#: src/Resources.vala:226 msgid "Setting as unrated" msgstr "Šalinamas įvertinimas" -#: src/Resources.vala:226 +#: src/Resources.vala:227 msgid "Remove any ratings" msgstr "Pašalinti visus įvertinimus" -#: src/Resources.vala:229 +#: src/Resources.vala:230 msgid "Rejected" msgstr "Atmesta" -#: src/Resources.vala:230 +#: src/Resources.vala:231 msgid "Rate Rejected" msgstr "Įvertinti kaip atmestą" -#: src/Resources.vala:231 +#: src/Resources.vala:232 msgid "Setting as rejected" msgstr "Nustatoma kaip atmesta" -#: src/Resources.vala:232 +#: src/Resources.vala:233 msgid "Set rating to rejected" msgstr "Įvertinti kaip atmestą" -#: src/Resources.vala:235 +#: src/Resources.vala:236 msgid "Rejected Only" msgstr "Tik atmestos" -#: src/Resources.vala:236 +#: src/Resources.vala:237 msgid "Show only rejected photos" msgstr "Rodyti tik atmestas nuotraukas" -#: src/Resources.vala:239 +#: src/Resources.vala:240 msgctxt "Tooltip" msgid "Show all photos, including rejected" msgstr "Rodyti visas nuotraukas, įskaitant atmestas" #. Button tooltip -#: src/Resources.vala:243 +#: src/Resources.vala:244 msgid "Show all photos" msgstr "Rodyti visas nuotraukas" -#: src/Resources.vala:246 +#: src/Resources.vala:247 msgid "Display each photo’s rating" msgstr "Rodyti kiekvienos nuotraukos įvertinimą" -#: src/Resources.vala:249 +#: src/Resources.vala:250 msgid "Filter Photos" msgstr "Filtruoti nuotraukas" -#: src/Resources.vala:250 +#: src/Resources.vala:251 msgid "Limit the number of photos displayed based on a filter" msgstr "Atsižvelgiant į filtrą, riboti rodytinų nuotraukų skaičių" -#: src/Resources.vala:253 +#: src/Resources.vala:254 msgid "Duplicate" msgstr "Sukurti kopiją" -#: src/Resources.vala:254 +#: src/Resources.vala:255 msgid "Make a duplicate of the photo" msgstr "Sukurti nuotraukos kopiją" -#: src/Resources.vala:258 +#: src/Resources.vala:259 msgid "_Print…" msgstr "S_pausdinti…" -#: src/Resources.vala:260 +#: src/Resources.vala:261 msgid "Pu_blish…" msgstr "_Viešinti…" #. Button label -#: src/Resources.vala:266 +#: src/Resources.vala:267 msgctxt "Button Label" msgid "Edit Title" msgstr "Taisyti antraštę" #. Button label -#: src/Resources.vala:270 +#: src/Resources.vala:271 msgid "Edit Comment" msgstr "Keisti komentarą" -#: src/Resources.vala:276 +#: src/Resources.vala:277 msgid "Adjust Date and Time" msgstr "Taisyti datą ir laiką" #. Dialog title -#: src/Resources.vala:281 +#: src/Resources.vala:282 msgctxt "Dialog Title" msgid "Add Tags" msgstr "Pridėti žymų" -#: src/Resources.vala:292 +#: src/Resources.vala:293 msgid "_Find…" msgstr "_Rasti…" -#: src/Resources.vala:296 +#: src/Resources.vala:297 msgid "_Flag" msgstr "_Žymėti" -#: src/Resources.vala:298 +#: src/Resources.vala:299 msgid "Un_flag" msgstr "At_žymėti" -#: src/Resources.vala:302 +#: src/Resources.vala:303 msgid "Mark faces of people in the photo" msgstr "Žymėti žmonių veidus nuotraukoje" -#: src/Resources.vala:303 +#: src/Resources.vala:304 msgid "Modify Faces" msgstr "Keisti veidus" -#: src/Resources.vala:304 +#: src/Resources.vala:305 msgid "Delete Face" msgstr "Šalinti veidą" -#: src/Resources.vala:310 +#: src/Resources.vala:311 #, c-format msgid "Unable to launch editor: %s" msgstr "Nepavyko paleisti rengyklės: %s" -#: src/Resources.vala:315 +#: src/Resources.vala:316 #, c-format msgid "Add Tag “%s”" msgstr "Pridėti žymą „%s“" #. Used when adding two tags to photo(s) -#: src/Resources.vala:318 +#: src/Resources.vala:319 #, c-format msgid "Add Tags “%s” and “%s”" msgstr "Pridėti žymas „%s“ ir „%s“" #. Undo/Redo command name (in Edit menu) -#: src/Resources.vala:323 +#: src/Resources.vala:324 msgctxt "UndoRedo menu entry" msgid "Add Tags" msgstr "Pridėti žymų" -#: src/Resources.vala:328 +#: src/Resources.vala:329 #, c-format msgid "_Delete Tag “%s”" msgstr "_Šalinti žymą „%s“" -#: src/Resources.vala:332 +#: src/Resources.vala:333 #, c-format msgid "Delete Tag “%s”" msgstr "Šalinti žymą „%s“" -#: src/Resources.vala:335 +#: src/Resources.vala:336 msgid "Delete Tag" msgstr "Šalinti žymą" -#: src/Resources.vala:341 +#: src/Resources.vala:342 #, c-format msgid "Re_name Tag “%s”…" msgstr "Per_vadinti žymą „%s“…" -#: src/Resources.vala:345 +#: src/Resources.vala:346 #, c-format msgid "Rename Tag “%s” to “%s”" msgstr "Pervadinti žymą „%s“ į „%s“" -#: src/Resources.vala:351 +#: src/Resources.vala:352 msgid "Modify Tags" msgstr "Keisti žymą" -#: src/Resources.vala:354 +#: src/Resources.vala:355 #, c-format msgid "Tag Photo as “%s”" msgid_plural "Tag Photos as “%s”" @@ -5923,7 +5924,7 @@ msgstr[0] "Žymėti nuotraukas kaip „%s“" msgstr[1] "Žymėti nuotraukas kaip „%s“" msgstr[2] "Žymėti nuotraukas kaip „%s“" -#: src/Resources.vala:360 +#: src/Resources.vala:361 #, c-format msgid "Tag the selected photo as “%s”" msgid_plural "Tag the selected photos as “%s”" @@ -5931,7 +5932,7 @@ msgstr[0] "Žymėti pasirinktą nuotrauką kaip „%s“" msgstr[1] "Žymėti pasirinktas nuotraukas kaip „%s“" msgstr[2] "Žymėti pasirinktas nuotraukas kaip „%s“" -#: src/Resources.vala:366 +#: src/Resources.vala:367 #, c-format msgid "Remove Tag “%s” From _Photo" msgid_plural "Remove Tag “%s” From _Photos" @@ -5939,7 +5940,7 @@ msgstr[0] "Pašalinti žymą „%s“ iš _nuotraukų" msgstr[1] "Pašalinti žymą „%s“ iš _nuotraukų" msgstr[2] "Pašalinti žymą „%s“ iš _nuotraukų" -#: src/Resources.vala:372 +#: src/Resources.vala:373 #, c-format msgid "Remove Tag “%s” From Photo" msgid_plural "Remove Tag “%s” From Photos" @@ -5947,41 +5948,41 @@ msgstr[0] "Pašalinti žymą „%s“ iš nuotraukų" msgstr[1] "Pašalinti žymą „%s“ iš nuotraukų" msgstr[2] "Pašalinti žymą „%s“ iš nuotraukų" -#: src/Resources.vala:378 +#: src/Resources.vala:379 #, c-format msgid "Unable to rename tag to “%s” because the tag already exists." msgstr "Nepavyko pervadinti žymos į „%s“, kadangi tokia žyma jau yra." -#: src/Resources.vala:382 +#: src/Resources.vala:383 #, c-format msgid "Unable to rename search to “%s” because the search already exists." msgstr "Nepavyko pervadinti paieškos į „%s“, nes tokia paieška jau yra." #. Saved search button -#: src/Resources.vala:385 src/SearchFilter.vala:1145 +#: src/Resources.vala:386 src/SearchFilter.vala:1145 msgid "Saved Search" msgstr "Įrašyta paieška" -#: src/Resources.vala:387 +#: src/Resources.vala:388 msgid "Delete Search" msgstr "Ištrinti paiešką" -#: src/Resources.vala:394 +#: src/Resources.vala:395 #, c-format msgid "Rename Search “%s” to “%s”" msgstr "Pervadinti paiešką „%s“ į „%s“" -#: src/Resources.vala:398 +#: src/Resources.vala:399 #, c-format msgid "Delete Search “%s”" msgstr "Ištrinti paiešką „%s“" -#: src/Resources.vala:402 +#: src/Resources.vala:403 #, c-format msgid "Unable to rename face to “%s” because the face already exists." msgstr "Nepavyko pervadinti žymos į „%s“, kadangi tokia žyma jau yra." -#: src/Resources.vala:406 +#: src/Resources.vala:407 #, c-format msgid "Remove Face “%s” From _Photo" msgid_plural "Remove Face “%s” From _Photos" @@ -5989,7 +5990,7 @@ msgstr[0] "Pašalinti veidą „%s“ iš _nuotraukų" msgstr[1] "Pašalinti veidą „%s“ iš _nuotraukų" msgstr[2] "Pašalinti veidą „%s“ iš _nuotraukų" -#: src/Resources.vala:411 +#: src/Resources.vala:412 #, c-format msgid "Remove Face “%s” From Photo" msgid_plural "Remove Face “%s” From Photos" @@ -5998,81 +5999,81 @@ msgstr[1] "Pašalinti veidą „%s“ iš nuotraukos" msgstr[2] "Pašalinti veidą „%s“ iš nuotraukos" #. Translators: This means to teach the face to the face recognition system -#: src/Resources.vala:417 src/Resources.vala:422 +#: src/Resources.vala:418 src/Resources.vala:423 #, c-format msgid "_Train Face “%s” From Photo" msgstr "_Mokyti atpažinti veidą „%s“ pagal nuotrauką" -#: src/Resources.vala:430 +#: src/Resources.vala:431 #, c-format msgid "Re_name Face “%s”…" msgstr "Per_vadinti veidą „%s“…" -#: src/Resources.vala:434 +#: src/Resources.vala:435 #, c-format msgid "Rename Face “%s” to “%s”" msgstr "Pervadinti veidą „%s“ į „%s“" -#: src/Resources.vala:438 +#: src/Resources.vala:439 #, c-format msgid "_Delete Face “%s”" msgstr "_Šalinti veidą „%s“" -#: src/Resources.vala:442 +#: src/Resources.vala:443 #, c-format msgid "Delete Face “%s”" msgstr "Ištrinti veidą „%s“" -#: src/Resources.vala:671 +#: src/Resources.vala:672 #, c-format msgid "Rate %s" msgstr "Įvertinti %s" -#: src/Resources.vala:672 +#: src/Resources.vala:673 #, c-format msgid "Set rating to %s" msgstr "Įvertinti %s" -#: src/Resources.vala:673 +#: src/Resources.vala:674 #, c-format msgid "Setting rating to %s" msgstr "Įvertinama %s" -#: src/Resources.vala:675 +#: src/Resources.vala:676 #, c-format msgid "Display %s" msgstr "Rodyti %s" -#: src/Resources.vala:676 +#: src/Resources.vala:677 #, c-format msgid "Only show photos with a rating of %s" msgstr "Rodyti tik nuotraukas, įvertintas %s" -#: src/Resources.vala:677 +#: src/Resources.vala:678 #, c-format msgid "%s or Better" msgstr "%s ar geresnes" -#: src/Resources.vala:678 +#: src/Resources.vala:679 #, c-format msgid "Display %s or Better" msgstr "Rodyti %s ar geresnes" -#: src/Resources.vala:679 +#: src/Resources.vala:680 #, c-format msgid "Only show photos with a rating of %s or better" msgstr "Rodyti nuotraukas, įvertintas %s ar geriau" -#: src/Resources.vala:777 +#: src/Resources.vala:778 msgid "Open the selected photo’s directory in the file manager" msgstr "Atverti pasirinktos nuotraukos aplanką failų tvarkytuvėje" -#: src/Resources.vala:780 +#: src/Resources.vala:781 #, c-format msgid "Unable to open in file manager: %s" msgstr "Nepavyko atverti failų tvarkytuvėje: %s" -#: src/Resources.vala:788 +#: src/Resources.vala:789 msgid "Select all items" msgstr "Pasirinkti visus elementus" @@ -6085,14 +6086,14 @@ msgstr "Pasirinkti visus elementus" #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006" #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format -#: src/Resources.vala:850 +#: src/Resources.vala:851 msgid "%a %b %d, %Y" msgstr "%Y %b %d, %a" #. / Locale-specific starting date format for multi-date strings, #. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006" #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format -#: src/Resources.vala:855 +#: src/Resources.vala:856 msgctxt "MultidayFormat" msgid "%a %b %d" msgstr "%a %b %d" @@ -6100,7 +6101,7 @@ msgstr "%a %b %d" #. / Locale-specific ending date format for multi-date strings, #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006" #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format -#: src/Resources.vala:860 +#: src/Resources.vala:861 msgctxt "MultidayFormat" msgid "%d, %Y" msgstr "%d, %Y" @@ -6108,7 +6109,7 @@ msgstr "%d, %Y" #. / Locale-specific calendar date format for multi-month strings, #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006" #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format -#: src/Resources.vala:865 +#: src/Resources.vala:866 msgctxt "MultimonthFormat" msgid "%a %b %d" msgstr "%a %b %d" @@ -6116,12 +6117,12 @@ msgstr "%a %b %d" #. / Locale-specific calendar date format for multi-month strings, #. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006" #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format -#: src/Resources.vala:870 +#: src/Resources.vala:871 msgctxt "MultimonthFormat" msgid "%a %b %d, %Y" msgstr "%Y %b %d, %a" -#: src/Screensaver.vala:18 src/SlideshowPage.vala:117 +#: src/Screensaver.vala:18 src/SlideshowPage.vala:128 msgid "Slideshow" msgstr "Demonstracija" @@ -6348,44 +6349,44 @@ msgstr "Naudoti įrašytą paiešką elementų filtravimui dabartiniame rodinyje #. Set up toolbar #. add toolbar buttons -#: src/SlideshowPage.vala:136 +#: src/SlideshowPage.vala:151 msgid "Back" msgstr "Atgal" -#: src/SlideshowPage.vala:138 +#: src/SlideshowPage.vala:153 msgid "Go to the previous photo" msgstr "Pereiti prie ankstesnės nuotraukos" -#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:250 +#: src/SlideshowPage.vala:158 src/SlideshowPage.vala:265 msgid "Pause" msgstr "Pristabdyti" -#: src/SlideshowPage.vala:145 src/SlideshowPage.vala:251 +#: src/SlideshowPage.vala:160 src/SlideshowPage.vala:266 msgid "Pause the slideshow" msgstr "Pristabdyti skaidrių peržiūrą" -#: src/SlideshowPage.vala:150 +#: src/SlideshowPage.vala:165 msgid "Next" msgstr "Kita" -#: src/SlideshowPage.vala:152 +#: src/SlideshowPage.vala:167 msgid "Go to the next photo" msgstr "Pereiti prie kitos nuotraukos" -#: src/SlideshowPage.vala:160 +#: src/SlideshowPage.vala:175 msgid "Change slideshow settings" msgstr "Keisti skaidrių peržiūros nustatymus" #. An entire slideshow set might be missing, so check for a loop. -#: src/SlideshowPage.vala:214 +#: src/SlideshowPage.vala:229 msgid "All photo source files are missing." msgstr "Trūksta visų nuotraukų šaltinių failų." -#: src/SlideshowPage.vala:246 +#: src/SlideshowPage.vala:261 msgid "Play" msgstr "Rodyti" -#: src/SlideshowPage.vala:247 +#: src/SlideshowPage.vala:262 msgid "Continue the slideshow" msgstr "Toliau rodyti skaidrių peržiūrą" @@ -6418,6 +6419,40 @@ msgstr "nepavadinta" msgid "Export Videos" msgstr "Eksportuoti vaizdo įrašus" +#~ msgid "Shotwell Profile Browser" +#~ msgstr "Shotwell profilio žiūryklė" + +#~ msgid "Flickr authorization failed" +#~ msgstr "Flickr autorizacijos klaida" + +#~ msgid "" +#~ "You have already logged in and out of a Google service during this " +#~ "Shotwell session.\n" +#~ "\n" +#~ "To continue publishing to Google services, quit and restart Shotwell, " +#~ "then try publishing again." +#~ msgstr "" +#~ "Šiame Shotwell seanse jau prisijungėte ir atsijungėte nuo Google " +#~ "tarnybos.\n" +#~ "\n" +#~ "Jei norite toliau viešinti naudodami Google tarnybas, paleiskite Shotwell " +#~ "išnaujo ir vėl bandykite viešinti." + +#~ msgid "%Y" +#~ msgstr "%Y" + +#~ msgid "%B" +#~ msgstr "%B" + +#~ msgid "Rename All" +#~ msgstr "Pervadinti viską" + +#~ msgid "Replace _All" +#~ msgstr "Pakeisti _visus" + +#~ msgid "Export" +#~ msgstr "Eksportuoti" + #~ msgid "authentication token" #~ msgstr "tapatybės patvirtinimo leksema" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Shotwell master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/shotwell/issues\n" -"POT-Creation-Date: 2023-06-04 13:27+0000\n" +"POT-Creation-Date: 2023-12-25 16:13+0000\n" "PO-Revision-Date: \n" "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n" "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n" @@ -24,7 +24,7 @@ msgstr "" "X-Generator: Poedit 2.2.1\n" #: data/gsettings/org.gnome.shotwell-extras.gschema.xml:6 -#: data/gsettings/org.gnome.shotwell.gschema.xml:432 +#: data/gsettings/org.gnome.shotwell.gschema.xml:438 msgid "OAuth Access Phase Token" msgstr "Žeton dostopa OAuth" @@ -33,7 +33,7 @@ msgid "The authorization token for the currently logged in Tumblr user, if any" msgstr "Žeton za overitev za trenutno prijavljenega uporabnika Tumblr" #: data/gsettings/org.gnome.shotwell-extras.gschema.xml:12 -#: data/gsettings/org.gnome.shotwell.gschema.xml:438 +#: data/gsettings/org.gnome.shotwell.gschema.xml:444 msgid "OAuth Access Phase Token Secret" msgstr "Geslo žetona dostopa OAuth" @@ -44,19 +44,19 @@ msgid "" msgstr "Šifrirno geslo uporabnika za trenutno prijavljenega uporabnika Tumblr" #: data/gsettings/org.gnome.shotwell-extras.gschema.xml:18 -#: data/gsettings/org.gnome.shotwell.gschema.xml:444 -#: data/gsettings/org.gnome.shotwell.gschema.xml:502 -#: data/gsettings/org.gnome.shotwell.gschema.xml:564 +#: data/gsettings/org.gnome.shotwell.gschema.xml:450 +#: data/gsettings/org.gnome.shotwell.gschema.xml:508 +#: data/gsettings/org.gnome.shotwell.gschema.xml:570 msgid "username" msgstr "uporabniško ime" #: data/gsettings/org.gnome.shotwell-extras.gschema.xml:19 -#: data/gsettings/org.gnome.shotwell.gschema.xml:445 +#: data/gsettings/org.gnome.shotwell.gschema.xml:451 msgid "The user name of the currently logged in Flickr user, if any" msgstr "Uporabniško ime trenutno prijavljenega uporabnika Flicker" #: data/gsettings/org.gnome.shotwell-extras.gschema.xml:24 -#: data/gsettings/org.gnome.shotwell.gschema.xml:476 +#: data/gsettings/org.gnome.shotwell.gschema.xml:482 msgid "default size" msgstr "privzeta velikost" @@ -381,59 +381,68 @@ msgstr "Pokaži naslov" msgid "Whether to show the title of a photo during the slideshow" msgstr "Ali naj bo prikazan naslov fotografije med predstavitvijo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:218 +#: data/gsettings/org.gnome.shotwell.gschema.xml:216 +#: data/ui/slideshow_settings.ui:154 +msgid "Shuffle" +msgstr "Premešaj" + +#: data/gsettings/org.gnome.shotwell.gschema.xml:217 +msgid "Whether to shuffle the order of photos during the slideshow" +msgstr "Ali želite premešati vrstni red fotografij med projekcijo" + +#: data/gsettings/org.gnome.shotwell.gschema.xml:224 msgid "maximize library window" msgstr "razpni okno zbirke" -#: data/gsettings/org.gnome.shotwell.gschema.xml:219 +#: data/gsettings/org.gnome.shotwell.gschema.xml:225 msgid "True if library application is maximized, false otherwise" msgstr "Izbrana možnost določa, da je okno zbirke razpeto" -#: data/gsettings/org.gnome.shotwell.gschema.xml:224 +#: data/gsettings/org.gnome.shotwell.gschema.xml:230 msgid "width of library window" msgstr "širina okna zbirke" -#: data/gsettings/org.gnome.shotwell.gschema.xml:225 +#: data/gsettings/org.gnome.shotwell.gschema.xml:231 msgid "The last recorded width of the library application window" msgstr "Zadnja zabeležena širina okna zbirke programa" -#: data/gsettings/org.gnome.shotwell.gschema.xml:230 +#: data/gsettings/org.gnome.shotwell.gschema.xml:236 msgid "height of library window" msgstr "višina okna zbirke" -#: data/gsettings/org.gnome.shotwell.gschema.xml:231 +#: data/gsettings/org.gnome.shotwell.gschema.xml:237 msgid "The last recorded height of the library application window" msgstr "Zadnja zabeležena višina okna zbirke programa" -#: data/gsettings/org.gnome.shotwell.gschema.xml:236 +#: data/gsettings/org.gnome.shotwell.gschema.xml:242 msgid "maximize direct-edit window" msgstr "razpni okno urejevalnika" -#: data/gsettings/org.gnome.shotwell.gschema.xml:237 +#: data/gsettings/org.gnome.shotwell.gschema.xml:243 msgid "True if direct-edit application is maximized, false otherwise" msgstr "Izbrana možnost določa, da je okno neposrednega urejevalnika razpeto" -#: data/gsettings/org.gnome.shotwell.gschema.xml:242 +#: data/gsettings/org.gnome.shotwell.gschema.xml:248 msgid "width of direct-edit window" msgstr "širina okna urejevalnika" -#: data/gsettings/org.gnome.shotwell.gschema.xml:243 +#: data/gsettings/org.gnome.shotwell.gschema.xml:249 msgid "The last recorded width of the direct-edit application window" msgstr "Zadnja zabeležena širina okna neposrednega urejevalnika" -#: data/gsettings/org.gnome.shotwell.gschema.xml:248 +#: data/gsettings/org.gnome.shotwell.gschema.xml:254 msgid "height of direct-edit window" msgstr "višina okna urejevalnika" -#: data/gsettings/org.gnome.shotwell.gschema.xml:249 +#: data/gsettings/org.gnome.shotwell.gschema.xml:255 msgid "The last recorded height of the direct-edit application window" msgstr "Zadnja zabeležena višina okna neposrednega urejevalnika" -#: data/gsettings/org.gnome.shotwell.gschema.xml:254 +#: data/gsettings/org.gnome.shotwell.gschema.xml:260 msgid "sidebar divider position" msgstr "položaj ločilnika stranske vrstice" -#: data/gsettings/org.gnome.shotwell.gschema.xml:255 +#: data/gsettings/org.gnome.shotwell.gschema.xml:261 msgid "" "The last recorded position of the divider between the sidebar and view in " "library application window" @@ -441,30 +450,30 @@ msgstr "" "Zadnji zabeleženi položaj razdelka med stransko vrstico in pogledom v oknu " "oknu zbirke" -#: data/gsettings/org.gnome.shotwell.gschema.xml:262 +#: data/gsettings/org.gnome.shotwell.gschema.xml:268 msgid "import directory" msgstr "uvozi mapo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:263 +#: data/gsettings/org.gnome.shotwell.gschema.xml:269 msgid "Directory in which imported photo files are placed" msgstr "Mapa, v kateri so zbrane uvožene datoteke fotografij" -#: data/gsettings/org.gnome.shotwell.gschema.xml:268 +#: data/gsettings/org.gnome.shotwell.gschema.xml:274 msgid "watch library directory for new files" msgstr "spremljaj mapo zbirke za nove datoteke" -#: data/gsettings/org.gnome.shotwell.gschema.xml:269 +#: data/gsettings/org.gnome.shotwell.gschema.xml:275 msgid "" "If true, files added to the library directory are automatically imported" msgstr "" "Izbrana možnost določa, da so datoteke, dodane v mapo zbirke, samodejno " "uvožene" -#: data/gsettings/org.gnome.shotwell.gschema.xml:274 +#: data/gsettings/org.gnome.shotwell.gschema.xml:280 msgid "write metadata to master files" msgstr "zapiši metapodatke v glavne datoteke" -#: data/gsettings/org.gnome.shotwell.gschema.xml:275 +#: data/gsettings/org.gnome.shotwell.gschema.xml:281 msgid "" "If true, changes to metadata (tags, titles, etc.) are written to the master " "photo file" @@ -472,11 +481,11 @@ msgstr "" "Izbrana možnost določa, da se spremembe metapodatkov (oznake, naslovi …) " "zapišejo v izvorno datoteko fotografije" -#: data/gsettings/org.gnome.shotwell.gschema.xml:280 +#: data/gsettings/org.gnome.shotwell.gschema.xml:286 msgid "use lowercase filenames" msgstr "uporabi male črke za imena datotek" -#: data/gsettings/org.gnome.shotwell.gschema.xml:281 +#: data/gsettings/org.gnome.shotwell.gschema.xml:287 msgid "" "If true, Shotwell will convert all filenames to lowercase when importing " "photo files" @@ -484,11 +493,11 @@ msgstr "" "Izbrana možnost določa, da bo program med uvozom samodejno preimenoval vsa " "imena datotek v male črke" -#: data/gsettings/org.gnome.shotwell.gschema.xml:286 +#: data/gsettings/org.gnome.shotwell.gschema.xml:292 msgid "directory pattern" msgstr "vzorec map" -#: data/gsettings/org.gnome.shotwell.gschema.xml:287 +#: data/gsettings/org.gnome.shotwell.gschema.xml:293 msgid "" "A string encoding a naming pattern that will be used to name photo " "directories on import" @@ -496,11 +505,11 @@ msgstr "" "Niz za kodiranje vzorca poimenovanja, ki bo uporabljen za poimenovanje map " "pri uvozu" -#: data/gsettings/org.gnome.shotwell.gschema.xml:292 +#: data/gsettings/org.gnome.shotwell.gschema.xml:298 msgid "directory pattern custom" msgstr "vzorec map po meri" -#: data/gsettings/org.gnome.shotwell.gschema.xml:293 +#: data/gsettings/org.gnome.shotwell.gschema.xml:299 msgid "" "A string encoding a custom naming pattern that will be used to name photo " "directories on import" @@ -508,27 +517,27 @@ msgstr "" "Niz za kodiranje vzorca poimenovanja po meri, ki bo uporabljen za " "poimenovanje map pri uvozu" -#: data/gsettings/org.gnome.shotwell.gschema.xml:298 +#: data/gsettings/org.gnome.shotwell.gschema.xml:304 msgid "RAW developer default" msgstr "privzeti razvijalnik RAW" -#: data/gsettings/org.gnome.shotwell.gschema.xml:299 +#: data/gsettings/org.gnome.shotwell.gschema.xml:305 msgid "Default option for which RAW developer Shotwell will use" msgstr "Privzeta izbira razvijalnika RAW za uporabo v programu" -#: data/gsettings/org.gnome.shotwell.gschema.xml:306 +#: data/gsettings/org.gnome.shotwell.gschema.xml:312 msgid "Most-recently-used crop aspect ratio menu choice" msgstr "Nazadnje uporabljeno razmerje obrezovanja v meniju izbire" -#: data/gsettings/org.gnome.shotwell.gschema.xml:307 +#: data/gsettings/org.gnome.shotwell.gschema.xml:313 msgid "A numeric code representing the last crop menu choice the user made" msgstr "Številska koda, ki ponazarja zadnjo izbiro obrezovanja v meniju" -#: data/gsettings/org.gnome.shotwell.gschema.xml:311 +#: data/gsettings/org.gnome.shotwell.gschema.xml:317 msgid "Most-recently-used crop custom aspect ratio’s numerator" msgstr "Nazadnje uporabljen števec v razmerju velikosti za obrezovanje po meri" -#: data/gsettings/org.gnome.shotwell.gschema.xml:312 +#: data/gsettings/org.gnome.shotwell.gschema.xml:318 msgid "" "A nonzero, positive integer representing the width part of the last custom " "crop ratio the user entered" @@ -536,12 +545,12 @@ msgstr "" "Ne-ničelno pozitivno celo število, ki predstavlja širino nazadnje " "uporabljenega razmerja, kot ga je vnesel uporabnik" -#: data/gsettings/org.gnome.shotwell.gschema.xml:316 +#: data/gsettings/org.gnome.shotwell.gschema.xml:322 msgid "Most-recently-used crop custom aspect ratio’s denominator" msgstr "" "Nazadnje uporabljen imenovalec v razmerju velikosti za obrezovanje po meri" -#: data/gsettings/org.gnome.shotwell.gschema.xml:317 +#: data/gsettings/org.gnome.shotwell.gschema.xml:323 msgid "" "A nonzero, positive integer representing the height part of the last custom " "crop ratio the user entered" @@ -549,90 +558,90 @@ msgstr "" "Ne-ničelno pozitivno celo število, ki predstavlja višino nazadnje " "uporabljenega razmerja, kot ga je vnesel uporabnik" -#: data/gsettings/org.gnome.shotwell.gschema.xml:324 +#: data/gsettings/org.gnome.shotwell.gschema.xml:330 msgid "external photo editor" msgstr "zunanji urejevalnik fotografij" -#: data/gsettings/org.gnome.shotwell.gschema.xml:325 +#: data/gsettings/org.gnome.shotwell.gschema.xml:331 msgid "External application used to edit photos" msgstr "Zunanji urejevalnik, uporabljen za urejanje fotografij" -#: data/gsettings/org.gnome.shotwell.gschema.xml:330 +#: data/gsettings/org.gnome.shotwell.gschema.xml:336 msgid "external raw editor" msgstr "zunanji urejevalnik raw" -#: data/gsettings/org.gnome.shotwell.gschema.xml:331 +#: data/gsettings/org.gnome.shotwell.gschema.xml:337 msgid "External application used to edit RAW photos" msgstr "Zunanji urejevalnik, uporabljen za urejanje fotografij RAW" -#: data/gsettings/org.gnome.shotwell.gschema.xml:373 -#: data/gsettings/org.gnome.shotwell.gschema.xml:374 +#: data/gsettings/org.gnome.shotwell.gschema.xml:379 +#: data/gsettings/org.gnome.shotwell.gschema.xml:380 msgid "Setting in export dialog: how to trim images" msgstr "Nastavitev v pogovornem oknu izvoza: kako prirezati slike" -#: data/gsettings/org.gnome.shotwell.gschema.xml:379 +#: data/gsettings/org.gnome.shotwell.gschema.xml:385 msgid "export metadata" msgstr "izvozi metapodatke" -#: data/gsettings/org.gnome.shotwell.gschema.xml:380 +#: data/gsettings/org.gnome.shotwell.gschema.xml:386 msgid "Setting in export dialog: option to export metadata" msgstr "Nastavitev v pogovornem oknu izvoza: možnost za izvoz metapodatkov" -#: data/gsettings/org.gnome.shotwell.gschema.xml:385 +#: data/gsettings/org.gnome.shotwell.gschema.xml:391 msgid "format setting, special value" msgstr "nastavitev zapisa, posebna vrednost" -#: data/gsettings/org.gnome.shotwell.gschema.xml:386 +#: data/gsettings/org.gnome.shotwell.gschema.xml:392 msgid "Setting in export dialog: format setting, special value" msgstr "" "Nastavitev v pogovornem oknu izvoza: nastavitev zapisa, posebna vrednost" -#: data/gsettings/org.gnome.shotwell.gschema.xml:391 +#: data/gsettings/org.gnome.shotwell.gschema.xml:397 msgid "format setting, type value" msgstr "nastavitev zapisa, vrsta vrednosti" -#: data/gsettings/org.gnome.shotwell.gschema.xml:392 +#: data/gsettings/org.gnome.shotwell.gschema.xml:398 msgid "Setting in export dialog: format setting, type value" msgstr "" "Nastavitev v pogovornem oknu izvoza: nastavitev zapisa, vrsta vrednosti" -#: data/gsettings/org.gnome.shotwell.gschema.xml:397 +#: data/gsettings/org.gnome.shotwell.gschema.xml:403 msgid "JPEG quality option" msgstr "možnost kakovosti JPEG" -#: data/gsettings/org.gnome.shotwell.gschema.xml:398 +#: data/gsettings/org.gnome.shotwell.gschema.xml:404 msgid "Setting in export dialog: jpeg quality option" msgstr "Nastavitev v pogovornem oknu izvoza: možnost kakovosti JPEG" -#: data/gsettings/org.gnome.shotwell.gschema.xml:403 +#: data/gsettings/org.gnome.shotwell.gschema.xml:409 msgid "maximal size of image" msgstr "največja velikost slike" -#: data/gsettings/org.gnome.shotwell.gschema.xml:404 +#: data/gsettings/org.gnome.shotwell.gschema.xml:410 msgid "Setting in export dialog: maximal size of image" msgstr "Nastavitev v pogovornem oknu izvoza: največja velikost slike" -#: data/gsettings/org.gnome.shotwell.gschema.xml:411 +#: data/gsettings/org.gnome.shotwell.gschema.xml:417 msgid "last used publishing service" msgstr "nazadnje uporabljena storitev objave" -#: data/gsettings/org.gnome.shotwell.gschema.xml:412 #: data/gsettings/org.gnome.shotwell.gschema.xml:418 +#: data/gsettings/org.gnome.shotwell.gschema.xml:424 msgid "" "A numeric code representing the last service to which photos were published" msgstr "" "Številska koda, ki predstavlja nazadnje uporabljeno storitev, s katero so " "bile objavljene fotografije" -#: data/gsettings/org.gnome.shotwell.gschema.xml:417 +#: data/gsettings/org.gnome.shotwell.gschema.xml:423 msgid "default publishing service" msgstr "Privzeta storitev za objavljanje" -#: data/gsettings/org.gnome.shotwell.gschema.xml:433 +#: data/gsettings/org.gnome.shotwell.gschema.xml:439 msgid "The authorization token for the currently logged in Flickr user, if any" msgstr "Žeton za overitev za trenutno prijavljenega uporabnika Flickr." -#: data/gsettings/org.gnome.shotwell.gschema.xml:439 +#: data/gsettings/org.gnome.shotwell.gschema.xml:445 msgid "" "The cryptographic secret used to sign requests against the authorization " "token for the currently logged in Flickr user, if any" @@ -640,36 +649,36 @@ msgstr "" "Kriptografska koda, uporabljena za podpis zahtev žetona za avtorizacijo za " "trenutno prijavljenega uporabnika Flickr" -#: data/gsettings/org.gnome.shotwell.gschema.xml:450 +#: data/gsettings/org.gnome.shotwell.gschema.xml:456 msgid "default size code" msgstr "privzeta koda velikosti" -#: data/gsettings/org.gnome.shotwell.gschema.xml:451 +#: data/gsettings/org.gnome.shotwell.gschema.xml:457 msgid "" "A numeric code representing the default size for photos published to Flickr" msgstr "" "Številčna vrednost, ki določa privzeto velikost fotografij, poslanih na " "Flickr" -#: data/gsettings/org.gnome.shotwell.gschema.xml:456 +#: data/gsettings/org.gnome.shotwell.gschema.xml:462 msgid "default visibility" msgstr "privzeta vidnost" -#: data/gsettings/org.gnome.shotwell.gschema.xml:457 +#: data/gsettings/org.gnome.shotwell.gschema.xml:463 msgid "" "A numeric code representing the default visibility for photos published to " "Flickr" msgstr "" "Številčna vrednost, ki določa privzeto vidnost fotografij, poslanih na Flickr" -#: data/gsettings/org.gnome.shotwell.gschema.xml:462 -#: data/gsettings/org.gnome.shotwell.gschema.xml:488 -#: data/gsettings/org.gnome.shotwell.gschema.xml:538 -#: data/gsettings/org.gnome.shotwell.gschema.xml:588 +#: data/gsettings/org.gnome.shotwell.gschema.xml:468 +#: data/gsettings/org.gnome.shotwell.gschema.xml:494 +#: data/gsettings/org.gnome.shotwell.gschema.xml:544 +#: data/gsettings/org.gnome.shotwell.gschema.xml:594 msgid "remove sensitive info from uploads" msgstr "odstrani občutljive podatke iz datotek pri pošiljanju" -#: data/gsettings/org.gnome.shotwell.gschema.xml:463 +#: data/gsettings/org.gnome.shotwell.gschema.xml:469 msgid "" "Whether images being uploaded to Flickr should have their metadata removed " "first" @@ -677,12 +686,12 @@ msgstr "" "Ali naj se pred pošiljanjem datotek na spletišče Flickr odstranijo " "metapodatki" -#: data/gsettings/org.gnome.shotwell.gschema.xml:470 -#: data/gsettings/org.gnome.shotwell.gschema.xml:608 +#: data/gsettings/org.gnome.shotwell.gschema.xml:476 +#: data/gsettings/org.gnome.shotwell.gschema.xml:614 msgid "refresh token" msgstr "osveži žeton" -#: data/gsettings/org.gnome.shotwell.gschema.xml:471 +#: data/gsettings/org.gnome.shotwell.gschema.xml:477 msgid "" "The OAuth token used to refresh the Google Photos session for the currently " "logged in user, if any" @@ -690,7 +699,7 @@ msgstr "" "Žeton OAuth, ki se uporablja za osvežitev seje fotografij Google za trenutno " "prijavljenega uporabnika" -#: data/gsettings/org.gnome.shotwell.gschema.xml:477 +#: data/gsettings/org.gnome.shotwell.gschema.xml:483 msgid "" "A numeric code representing the default size for photos uploaded to Google " "Photos Albums" @@ -698,17 +707,17 @@ msgstr "" "Številčna vrednost, ki določa privzeto velikost fotografij, poslanih na " "Google Photos" -#: data/gsettings/org.gnome.shotwell.gschema.xml:482 -#: data/gsettings/org.gnome.shotwell.gschema.xml:582 +#: data/gsettings/org.gnome.shotwell.gschema.xml:488 +#: data/gsettings/org.gnome.shotwell.gschema.xml:588 msgid "last album" msgstr "zadnji album" -#: data/gsettings/org.gnome.shotwell.gschema.xml:483 -#: data/gsettings/org.gnome.shotwell.gschema.xml:583 +#: data/gsettings/org.gnome.shotwell.gschema.xml:489 +#: data/gsettings/org.gnome.shotwell.gschema.xml:589 msgid "The name of the last album the user published photos to, if any" msgstr "Ime zadnjega albuma, v katerega je uporabnik objavil fotografije" -#: data/gsettings/org.gnome.shotwell.gschema.xml:489 +#: data/gsettings/org.gnome.shotwell.gschema.xml:495 msgid "" "Whether images being uploaded to Google Photos should have their metadata " "removed first" @@ -716,55 +725,55 @@ msgstr "" "Ali naj se pred pošiljanjem datotek na spletišče Google Photos odstranijo " "metapodatki" -#: data/gsettings/org.gnome.shotwell.gschema.xml:496 +#: data/gsettings/org.gnome.shotwell.gschema.xml:502 msgid "Piwigo URL" msgstr "Naslov URL Piwigo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:497 +#: data/gsettings/org.gnome.shotwell.gschema.xml:503 msgid "URL of the Piwigo server" msgstr "Naslov URL strežnika Piwigo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:503 +#: data/gsettings/org.gnome.shotwell.gschema.xml:509 msgid "Piwigo username, if logged in" msgstr "Uporabniško ime za strežnik Piwigo, če je uporabnik prijavljen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:508 +#: data/gsettings/org.gnome.shotwell.gschema.xml:514 msgid "password" msgstr "geslo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:509 +#: data/gsettings/org.gnome.shotwell.gschema.xml:515 msgid "Piwigo password, if logged in" msgstr "Geslo uporabnika, če je ta prijavljen" -#: data/gsettings/org.gnome.shotwell.gschema.xml:514 +#: data/gsettings/org.gnome.shotwell.gschema.xml:520 msgid "remember password" msgstr "zapomni si geslo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:515 +#: data/gsettings/org.gnome.shotwell.gschema.xml:521 msgid "If true, remember the Piwigo password" msgstr "Izbrana možnost omogoča shranjevanje gesla Piwigo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:520 +#: data/gsettings/org.gnome.shotwell.gschema.xml:526 msgid "last category" msgstr "zadnja kategorija" -#: data/gsettings/org.gnome.shotwell.gschema.xml:521 +#: data/gsettings/org.gnome.shotwell.gschema.xml:527 msgid "The last selected Piwigo category" msgstr "Nazadnje izbrana kategorija Piwigo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:526 +#: data/gsettings/org.gnome.shotwell.gschema.xml:532 msgid "last permission level" msgstr "zadnja raven dovoljenja" -#: data/gsettings/org.gnome.shotwell.gschema.xml:527 +#: data/gsettings/org.gnome.shotwell.gschema.xml:533 msgid "The last chosen Piwigo permission level" msgstr "Zadnja izbrana raven dovoljenj za Piwigo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:532 +#: data/gsettings/org.gnome.shotwell.gschema.xml:538 msgid "last photo size" msgstr "zadnja velikost fotografije" -#: data/gsettings/org.gnome.shotwell.gschema.xml:533 +#: data/gsettings/org.gnome.shotwell.gschema.xml:539 msgid "" "A numeric code representing the last photo size preset used when publishing " "to Piwigo" @@ -772,7 +781,7 @@ msgstr "" "Številčna koda, ki predstavlja zadnjo nastavitev velikosti fotografije, " "uporabljeno pri objavi na spletišče Piwigo." -#: data/gsettings/org.gnome.shotwell.gschema.xml:539 +#: data/gsettings/org.gnome.shotwell.gschema.xml:545 msgid "" "Whether images being uploaded to Piwigo should have their metadata removed " "first" @@ -780,14 +789,14 @@ msgstr "" "Ali naj se pred pošiljanjem datotek na spletišče Piwigo odstranijo " "metapodatki" -#: data/gsettings/org.gnome.shotwell.gschema.xml:544 +#: data/gsettings/org.gnome.shotwell.gschema.xml:550 msgid "" "if title is set and comment unset, use title as comment for uploads to Piwigo" msgstr "" "če je naslov nastavljen, opomb pa ni, uporabi naslov kot opombo pri " "pošiljanju na Piwigo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:545 +#: data/gsettings/org.gnome.shotwell.gschema.xml:551 msgid "" "Whether images being uploaded to Piwigo should have their comment set from " "the title if title is set and comment unset" @@ -795,11 +804,11 @@ msgstr "" "Ali naj se slikam, poslanim na Piwigo, vpiše opomba po nazivu slike, če je " "ta določen, opomba pa ne" -#: data/gsettings/org.gnome.shotwell.gschema.xml:550 +#: data/gsettings/org.gnome.shotwell.gschema.xml:556 msgid "do not upload tags when uploading to Piwigo" msgstr "ne pošiljaj oznak pri objavljanju na Piwigo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:551 +#: data/gsettings/org.gnome.shotwell.gschema.xml:557 msgid "" "Whether images being uploaded to Piwigo should have their tags removed on " "upload, such that these tags will not appear on the remote Piwigo server" @@ -807,11 +816,11 @@ msgstr "" "Ali naj se slikam, objavljenim na Piwigo, odstranijo oznake, da te ne bodo " "vidne na oddaljenem strežniku" -#: data/gsettings/org.gnome.shotwell.gschema.xml:556 +#: data/gsettings/org.gnome.shotwell.gschema.xml:562 msgid "do not upload ratings when uploading to Piwigo" msgstr "ne pošiljaj ocen slik pri objavljanju na Piwigo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:557 +#: data/gsettings/org.gnome.shotwell.gschema.xml:563 msgid "" "Whether images being uploaded to Piwigo should have their ratings uploaded, " "such that these ratings will not appear on the remote Piwigo server" @@ -819,27 +828,27 @@ msgstr "" "Ali naj se slikam, objavljenim na Piwigo, odstranijo ocene, da te ne bodo " "vidne na oddaljenem strežniku" -#: data/gsettings/org.gnome.shotwell.gschema.xml:565 +#: data/gsettings/org.gnome.shotwell.gschema.xml:571 msgid "Gallery3 username" msgstr "Uporabniško ime Gallery3" -#: data/gsettings/org.gnome.shotwell.gschema.xml:570 +#: data/gsettings/org.gnome.shotwell.gschema.xml:576 msgid "API key" msgstr "Ključ API" -#: data/gsettings/org.gnome.shotwell.gschema.xml:571 +#: data/gsettings/org.gnome.shotwell.gschema.xml:577 msgid "Gallery3 API key" msgstr "Ključ API Galerije3" -#: data/gsettings/org.gnome.shotwell.gschema.xml:576 +#: data/gsettings/org.gnome.shotwell.gschema.xml:582 msgid "URL" msgstr "Naslov URL" -#: data/gsettings/org.gnome.shotwell.gschema.xml:577 +#: data/gsettings/org.gnome.shotwell.gschema.xml:583 msgid "Gallery3 site URL" msgstr "Naslov URL Galerije3:" -#: data/gsettings/org.gnome.shotwell.gschema.xml:589 +#: data/gsettings/org.gnome.shotwell.gschema.xml:595 msgid "" "Whether images being uploaded to Gallery3 should have their metadata removed " "first" @@ -847,19 +856,19 @@ msgstr "" "Ali naj se pred pošiljanjem datotek na spletišče Gallery3 odstranijo " "metapodatki" -#: data/gsettings/org.gnome.shotwell.gschema.xml:594 +#: data/gsettings/org.gnome.shotwell.gschema.xml:600 msgid "scaling constraint of uploaded picture" msgstr "omejitev prilagajanja velikosti objavljenih slik" -#: data/gsettings/org.gnome.shotwell.gschema.xml:595 +#: data/gsettings/org.gnome.shotwell.gschema.xml:601 msgid "The scaling constraint ID of the picture to be uploaded" msgstr "ID omejitve prilagajanja velikosti objavljene slike" -#: data/gsettings/org.gnome.shotwell.gschema.xml:600 +#: data/gsettings/org.gnome.shotwell.gschema.xml:606 msgid "pixels of the major axis uploaded picture" msgstr "točke glavne osi objavljene slike" -#: data/gsettings/org.gnome.shotwell.gschema.xml:601 +#: data/gsettings/org.gnome.shotwell.gschema.xml:607 msgid "" "The pixels of the major axis of the picture to be uploaded; used only if " "scaling-constraint-id is an appropriate value" @@ -867,7 +876,7 @@ msgstr "" "Točke glavne osi za pošiljanje se uporabljajo le, če je določena ustrezna " "vrednost omejitve" -#: data/gsettings/org.gnome.shotwell.gschema.xml:609 +#: data/gsettings/org.gnome.shotwell.gschema.xml:615 msgid "" "The OAuth token used to refresh the YouTube session for the currently logged " "in user, if any" @@ -875,56 +884,56 @@ msgstr "" "Žeton OAuth, uporabljen za osveževanje seje YouTube, za trenutno " "prijavljnega uporabnika" -#: data/gsettings/org.gnome.shotwell.gschema.xml:616 +#: data/gsettings/org.gnome.shotwell.gschema.xml:622 msgid "last used import service" msgstr "nazadnje uporabljena storitev uvoza" -#: data/gsettings/org.gnome.shotwell.gschema.xml:617 +#: data/gsettings/org.gnome.shotwell.gschema.xml:623 msgid "" "A numeric code representing the last service from which photos were imported" msgstr "" "Številska koda, ki predstavlja nazadnje uporabljeno storitev, s katero so " "bile uvožene fotografije" -#: data/gsettings/org.gnome.shotwell.gschema.xml:624 +#: data/gsettings/org.gnome.shotwell.gschema.xml:630 msgid "content layout mode" msgstr "način razvrstitve vsebine" -#: data/gsettings/org.gnome.shotwell.gschema.xml:625 +#: data/gsettings/org.gnome.shotwell.gschema.xml:631 msgid "" "A numeric code that describes how photos are laid out on the page during " "printing" msgstr "Številska koda, ki določa postavitev fotografij med tiskanjem" -#: data/gsettings/org.gnome.shotwell.gschema.xml:630 +#: data/gsettings/org.gnome.shotwell.gschema.xml:636 msgid "content ppi" msgstr "slikovna gostota vsebine" -#: data/gsettings/org.gnome.shotwell.gschema.xml:631 +#: data/gsettings/org.gnome.shotwell.gschema.xml:637 msgid "The number of pixels per inch (ppi) sent to the printer during printing" msgstr "Število točk na unčo (ppi), poslanih na tiskalnik med tiskanjem" -#: data/gsettings/org.gnome.shotwell.gschema.xml:636 +#: data/gsettings/org.gnome.shotwell.gschema.xml:642 msgid "content width" msgstr "širina vsebine" -#: data/gsettings/org.gnome.shotwell.gschema.xml:637 +#: data/gsettings/org.gnome.shotwell.gschema.xml:643 msgid "The width of the printed emulsion on the page when printing" msgstr "Širina natisnjene emulzije na strani med printanjem" -#: data/gsettings/org.gnome.shotwell.gschema.xml:642 +#: data/gsettings/org.gnome.shotwell.gschema.xml:648 msgid "content height" msgstr "višina vsebine" -#: data/gsettings/org.gnome.shotwell.gschema.xml:643 +#: data/gsettings/org.gnome.shotwell.gschema.xml:649 msgid "The height of the printed emulsion on the page when printing" msgstr "Višina natisnjene emulzije na strani med printanjem" -#: data/gsettings/org.gnome.shotwell.gschema.xml:648 +#: data/gsettings/org.gnome.shotwell.gschema.xml:654 msgid "content units" msgstr "enote vsebine" -#: data/gsettings/org.gnome.shotwell.gschema.xml:649 +#: data/gsettings/org.gnome.shotwell.gschema.xml:655 msgid "" "A numeric code representing unit of measure (inches or centimeters) used " "when printing" @@ -932,11 +941,11 @@ msgstr "" "Številska koda, ki določa enoto merila (cole ali centimetri) za pošiljanje " "na tiskalnik" -#: data/gsettings/org.gnome.shotwell.gschema.xml:654 +#: data/gsettings/org.gnome.shotwell.gschema.xml:660 msgid "images per page code" msgstr "koda števila slik na stran" -#: data/gsettings/org.gnome.shotwell.gschema.xml:655 +#: data/gsettings/org.gnome.shotwell.gschema.xml:661 msgid "" "A numeric code representing the currently selected images per page mode used " "when printing" @@ -944,21 +953,21 @@ msgstr "" "Številčna koda, ki predstavlja trenutno število slik na stran, uporabljeno " "pri tiskanju" -#: data/gsettings/org.gnome.shotwell.gschema.xml:660 +#: data/gsettings/org.gnome.shotwell.gschema.xml:666 msgid "size selection" msgstr "izbor velikosti" -#: data/gsettings/org.gnome.shotwell.gschema.xml:661 +#: data/gsettings/org.gnome.shotwell.gschema.xml:667 msgid "" "The index of the current print size in a pre-defined list of standard sizes" msgstr "" "Indeks trenutne velikosti strani tiskanja med možnostmi standardnih velikosti" -#: data/gsettings/org.gnome.shotwell.gschema.xml:666 +#: data/gsettings/org.gnome.shotwell.gschema.xml:672 msgid "match aspect ratio" msgstr "upoštevaj razmerje velikosti fotograije" -#: data/gsettings/org.gnome.shotwell.gschema.xml:667 +#: data/gsettings/org.gnome.shotwell.gschema.xml:673 msgid "" "Determines whether custom print sizes must match the aspect ratio of the " "original photo" @@ -966,11 +975,11 @@ msgstr "" "Določa, ali se mora razmerje velikosti pri tiskanju ujemati z razmerjem " "velikosti izvorne fotografije" -#: data/gsettings/org.gnome.shotwell.gschema.xml:672 +#: data/gsettings/org.gnome.shotwell.gschema.xml:678 msgid "print titles" msgstr "natisni naslove" -#: data/gsettings/org.gnome.shotwell.gschema.xml:673 +#: data/gsettings/org.gnome.shotwell.gschema.xml:679 msgid "" "True if the title of a photo should be printed when the photo is printed, " "false otherwise" @@ -978,182 +987,182 @@ msgstr "" "Izbrana možnost določa, da se med tiskanjem fotografije natisne tudi naslov " "fotografije" -#: data/gsettings/org.gnome.shotwell.gschema.xml:678 +#: data/gsettings/org.gnome.shotwell.gschema.xml:684 msgid "titles font" msgstr "pisava naslova" -#: data/gsettings/org.gnome.shotwell.gschema.xml:679 +#: data/gsettings/org.gnome.shotwell.gschema.xml:685 msgid "The name of the font to use for photo titles when they are printed" msgstr "" "Pisava, ki naj bo uporabljena za izpis naslovov fotografij pri tiskanju" -#: data/gsettings/org.gnome.shotwell.gschema.xml:690 +#: data/gsettings/org.gnome.shotwell.gschema.xml:696 msgid "enable flickr publishing plugin" msgstr "omogoči vstavek za objavljanje na flickr" -#: data/gsettings/org.gnome.shotwell.gschema.xml:691 +#: data/gsettings/org.gnome.shotwell.gschema.xml:697 msgid "True if the Flickr publishing plugin is enabled, false otherwise" msgstr "" "Izbrana možnost določa, da je omogočen vstavek za objavljanje fotografij na " "Flickr" -#: data/gsettings/org.gnome.shotwell.gschema.xml:696 #: data/gsettings/org.gnome.shotwell.gschema.xml:702 +#: data/gsettings/org.gnome.shotwell.gschema.xml:708 msgid "enable Google Photos publishing plugin" msgstr "omogoči vstavek za objavljanje na fotografije Google" -#: data/gsettings/org.gnome.shotwell.gschema.xml:697 #: data/gsettings/org.gnome.shotwell.gschema.xml:703 +#: data/gsettings/org.gnome.shotwell.gschema.xml:709 msgid "True if the Google Photos publishing plugin is enabled, false otherwise" msgstr "" "Izbrana možnost določa, da je omogočen vstavek za objavljanje fotografij na " "Google Photos" -#: data/gsettings/org.gnome.shotwell.gschema.xml:708 +#: data/gsettings/org.gnome.shotwell.gschema.xml:714 msgid "enable youtube publishing plugin" msgstr "omogoči vstavek za objavljanje na youtube" -#: data/gsettings/org.gnome.shotwell.gschema.xml:709 +#: data/gsettings/org.gnome.shotwell.gschema.xml:715 msgid "True if the YouTube publishing plugin is enabled, false otherwise" msgstr "" "Izbrana možnost določa, da je omogočen vstavek za objavljanje fotografij na " "YouTube" -#: data/gsettings/org.gnome.shotwell.gschema.xml:714 +#: data/gsettings/org.gnome.shotwell.gschema.xml:720 msgid "enable piwigo publishing plugin" msgstr "omogoči vstavek za objavljanje na piwigo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:715 +#: data/gsettings/org.gnome.shotwell.gschema.xml:721 msgid "True if the Piwigo publishing plugin is enabled, false otherwise" msgstr "" "Izbrana možnost določa, da je omogočen vstavek za objavljanje fotografij na " "Piwigo" -#: data/gsettings/org.gnome.shotwell.gschema.xml:720 +#: data/gsettings/org.gnome.shotwell.gschema.xml:726 msgid "enable tumblr publishing plugin" msgstr "omogoči vstavek za objavljanje na tumblr" -#: data/gsettings/org.gnome.shotwell.gschema.xml:721 +#: data/gsettings/org.gnome.shotwell.gschema.xml:727 msgid "True if the Tumblr publishing plugin is enabled, false otherwise" msgstr "" "Izbrana možnost določa, da je omogočen vstavek za objavljanje fotografij na " "Tumblr" -#: data/gsettings/org.gnome.shotwell.gschema.xml:726 +#: data/gsettings/org.gnome.shotwell.gschema.xml:732 msgid "enable gallery3 publishing plugin" msgstr "omogoči vstavek za objavljanje na gallery3" -#: data/gsettings/org.gnome.shotwell.gschema.xml:727 +#: data/gsettings/org.gnome.shotwell.gschema.xml:733 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise" msgstr "" "Izbrana možnost določa, da je omogočen vstavek za objavljanje fotografij na " "Gallery3" -#: data/gsettings/org.gnome.shotwell.gschema.xml:732 +#: data/gsettings/org.gnome.shotwell.gschema.xml:738 msgid "enable slideshow crumble transition" msgstr "omogoči prehod drobljenja v predstavitvi" -#: data/gsettings/org.gnome.shotwell.gschema.xml:733 +#: data/gsettings/org.gnome.shotwell.gschema.xml:739 msgid "" "True if the Crumble slideshow transition plugin is enabled, false otherwise" msgstr "Izbrana možnost določa, da je omogočen vstavek za uvažanje F-Spot" -#: data/gsettings/org.gnome.shotwell.gschema.xml:738 +#: data/gsettings/org.gnome.shotwell.gschema.xml:744 msgid "enable slideshow fade transition" msgstr "omogoči prehod bledenja v predstavitvi" -#: data/gsettings/org.gnome.shotwell.gschema.xml:739 +#: data/gsettings/org.gnome.shotwell.gschema.xml:745 msgid "" "True if the Fade slideshow transition plugin is enabled, false otherwise" msgstr "Izbrana možnost določa, da je omogočen vstavek za prehod bledenja" -#: data/gsettings/org.gnome.shotwell.gschema.xml:744 +#: data/gsettings/org.gnome.shotwell.gschema.xml:750 msgid "enable slideshow slide transition" msgstr "omogoči prehod drsenja v predstavitvi" -#: data/gsettings/org.gnome.shotwell.gschema.xml:745 +#: data/gsettings/org.gnome.shotwell.gschema.xml:751 msgid "" "True if the Slide slideshow transition plugin is enabled, false otherwise" msgstr "Izbrana možnost določa, da je omogočen vstavek za prehod drsenja" -#: data/gsettings/org.gnome.shotwell.gschema.xml:750 +#: data/gsettings/org.gnome.shotwell.gschema.xml:756 msgid "enable slideshow clock transition" msgstr "omogoči prehod urnega brisalca v predstavitvi" -#: data/gsettings/org.gnome.shotwell.gschema.xml:751 +#: data/gsettings/org.gnome.shotwell.gschema.xml:757 msgid "" "True if the Clock slideshow transition plugin is enabled, false otherwise" msgstr "" "Izbrana možnost določa, da je omogočen vstavek za prehod urnega brisalca" -#: data/gsettings/org.gnome.shotwell.gschema.xml:756 +#: data/gsettings/org.gnome.shotwell.gschema.xml:762 msgid "enable slideshow circle transition" msgstr "omogoči krožni prehod v predstavitvi" -#: data/gsettings/org.gnome.shotwell.gschema.xml:757 +#: data/gsettings/org.gnome.shotwell.gschema.xml:763 msgid "" "True if the Circle slideshow transition plugin is enabled, false otherwise" msgstr "Izbrana možnost določa, da je omogočen vstavek za krožni prehod" -#: data/gsettings/org.gnome.shotwell.gschema.xml:762 +#: data/gsettings/org.gnome.shotwell.gschema.xml:768 msgid "enable slideshow circles transition" msgstr "omogoči večkrožni prehod v predstavitvi" -#: data/gsettings/org.gnome.shotwell.gschema.xml:763 +#: data/gsettings/org.gnome.shotwell.gschema.xml:769 msgid "" "True if the Circles slideshow transition plugin is enabled, false otherwise" msgstr "Izbrana možnost določa, da je omogočen vstavek za večkrožni prehod" -#: data/gsettings/org.gnome.shotwell.gschema.xml:768 +#: data/gsettings/org.gnome.shotwell.gschema.xml:774 msgid "enable slideshow blinds transition" msgstr "omogoči prehod senčenja v predstavitvi" -#: data/gsettings/org.gnome.shotwell.gschema.xml:769 +#: data/gsettings/org.gnome.shotwell.gschema.xml:775 msgid "" "True if the Blinds slideshow transition plugin is enabled, false otherwise" msgstr "Izbrana možnost določa, da je omogočen vstavek za prehod senčenja" -#: data/gsettings/org.gnome.shotwell.gschema.xml:774 +#: data/gsettings/org.gnome.shotwell.gschema.xml:780 msgid "enable slideshow squares transition" msgstr "omogoči kvadratni prehod v predstavitvi" -#: data/gsettings/org.gnome.shotwell.gschema.xml:775 +#: data/gsettings/org.gnome.shotwell.gschema.xml:781 msgid "" "True if the Squares slideshow transition plugin is enabled, false otherwise" msgstr "Izbrana možnost določa, da je omogočen vstavek za kvadratni prehod" -#: data/gsettings/org.gnome.shotwell.gschema.xml:780 +#: data/gsettings/org.gnome.shotwell.gschema.xml:786 msgid "enable slideshow stripes transition" msgstr "omogoči prehod prog v predstavitvi" -#: data/gsettings/org.gnome.shotwell.gschema.xml:781 +#: data/gsettings/org.gnome.shotwell.gschema.xml:787 msgid "" "True if the Stripes slideshow transition plugin is enabled, false otherwise" msgstr "Izbrana možnost določa, da je omogočen vstavek za prehod prog" -#: data/gsettings/org.gnome.shotwell.gschema.xml:786 +#: data/gsettings/org.gnome.shotwell.gschema.xml:792 msgid "enable slideshow chess transition" msgstr "omogoči prehod šahovnice v predstavitvi" -#: data/gsettings/org.gnome.shotwell.gschema.xml:787 +#: data/gsettings/org.gnome.shotwell.gschema.xml:793 msgid "" "True if the Chess-Board slideshow transition plugin is enabled, false " "otherwise" msgstr "Izbrana možnost določa, da je omogočen vstavek za prehod šahovnice" -#: data/org.gnome.Shotwell.appdata.xml.in:8 +#: data/org.gnome.Shotwell.appdata.xml.in:9 #: data/org.gnome.Shotwell.desktop.in:4 data/ui/collection.ui:85 #: data/ui/event.ui:356 data/ui/event.ui:524 data/ui/faces.ui:356 -#: data/ui/media.ui:356 data/ui/photo_context.ui:91 data/ui/photo.ui:351 +#: data/ui/media.ui:356 data/ui/photo_context.ui:91 data/ui/photo.ui:349 #: data/ui/tags.ui:356 src/photos/RawSupport.vala:313 msgid "Shotwell" msgstr "Shotwell +" -#: data/org.gnome.Shotwell.appdata.xml.in:9 +#: data/org.gnome.Shotwell.appdata.xml.in:10 msgid "Digital photo organizer" msgstr "Urejevalnik digitalnih fotografij" -#: data/org.gnome.Shotwell.appdata.xml.in:11 +#: data/org.gnome.Shotwell.appdata.xml.in:12 msgid "" "Shotwell is an easy-to-use, fast photo organizer designed for the GNOME " "desktop. It allows you to import photos from your camera or disk, organize " @@ -1169,7 +1178,7 @@ msgstr "" "prilagajanje barv in izboljševanje. Urejevalnik ne spreminja izvornih " "fotografij, kar olajša preizkušanje in poenostavlja odpravljanje napak." -#: data/org.gnome.Shotwell.appdata.xml.in:18 +#: data/org.gnome.Shotwell.appdata.xml.in:19 msgid "" "When ready, Shotwell can upload your photos to various web services, such as " "Flickr, Google Photos, and more." @@ -1177,7 +1186,7 @@ msgstr "" "Ko so pripravljene, lahko s programom fotografije objavite v različne " "spletne storitve, kot so Flickr, Google Photos in številne druge." -#: data/org.gnome.Shotwell.appdata.xml.in:22 +#: data/org.gnome.Shotwell.appdata.xml.in:23 msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats." msgstr "Program podpira zapise JPEG, PNG, TIFF in različne zapise RAW." @@ -1186,8 +1195,7 @@ msgid "The Shotwell developers" msgstr "Razvijalci programa" # GNOME Application Class ("Generic Name") -#: data/org.gnome.Shotwell.desktop.in:5 -#: data/org.gnome.Shotwell-Profile-Browser.desktop.in:5 src/Resources.vala:9 +#: data/org.gnome.Shotwell.desktop.in:5 src/Resources.vala:9 msgid "Photo Manager" msgstr "Upravljalnik fotografij" @@ -1208,12 +1216,7 @@ msgstr "" "tiskanje;objavljanje;rotacija;sukanje;obrni;obračanje;oznake;souporaba;video;" "flickr;picasa;youtube;piwigo;" -# GNOME Application Name for Direct Edit Mode -#: data/org.gnome.Shotwell-Profile-Browser.desktop.in:4 -msgid "Shotwell Profile Browser" -msgstr "Brskalnik profilov Shotwell" - -#: data/org.gnome.Shotwell-Profile-Browser.desktop.in:6 +#: data/org.gnome.Shotwell.desktop.in:21 msgid "Manage Different Profiles In Shotwell" msgstr "Upravljajte različne profile v Shotwellu" @@ -1228,99 +1231,99 @@ msgid "Photo Viewer" msgstr "Pregledovalnik fotografij" #: data/ui/collection.ui:8 data/ui/direct_context.ui:7 data/ui/direct.ui:136 -#: data/ui/event.ui:447 data/ui/photo_context.ui:6 data/ui/photo.ui:227 +#: data/ui/event.ui:447 data/ui/photo_context.ui:6 data/ui/photo.ui:225 #: src/CollectionPage.vala:119 src/Resources.vala:153 msgid "_Enhance" msgstr "_Izboljšaj" #: data/ui/collection.ui:13 data/ui/direct_context.ui:12 data/ui/direct.ui:163 -#: data/ui/event.ui:452 data/ui/photo_context.ui:11 data/ui/photo.ui:254 +#: data/ui/event.ui:452 data/ui/photo_context.ui:11 data/ui/photo.ui:252 #: src/CollectionPage.vala:120 src/Resources.vala:181 msgid "Re_vert to Original" msgstr "Po_vrni na izvirnik" #: data/ui/collection.ui:19 data/ui/event.ui:407 data/ui/event.ui:458 -#: data/ui/faces.ui:390 data/ui/media.ui:390 data/ui/photo.ui:379 +#: data/ui/faces.ui:390 data/ui/media.ui:390 data/ui/photo.ui:377 #: data/ui/tags.ui:390 src/Resources.vala:279 msgid "Add _Tags…" msgstr "_Dodaj oznake …" #: data/ui/collection.ui:24 data/ui/event.ui:412 data/ui/event.ui:463 #: data/ui/faces.ui:395 data/ui/media.ui:395 data/ui/photo_context.ui:22 -#: data/ui/photo.ui:384 data/ui/tags.ui:395 src/Resources.vala:351 +#: data/ui/photo.ui:382 data/ui/tags.ui:395 src/Resources.vala:351 msgid "Modif_y Tags…" msgstr "_Spremeni oznake …" #: data/ui/collection.ui:33 data/ui/event.ui:281 data/ui/event.ui:472 #: data/ui/faces.ui:281 data/ui/media.ui:281 data/ui/photo_context.ui:30 -#: data/ui/photo.ui:272 data/ui/tags.ui:281 +#: data/ui/photo.ui:270 data/ui/tags.ui:281 msgid "Toggle _Flag" msgstr "_Preklopi zastavico" #: data/ui/collection.ui:39 data/ui/event.ui:286 data/ui/event.ui:478 #: data/ui/faces.ui:286 data/ui/media.ui:286 data/ui/photo_context.ui:35 -#: data/ui/photo.ui:277 data/ui/tags.ui:286 src/Resources.vala:213 +#: data/ui/photo.ui:275 data/ui/tags.ui:286 src/Resources.vala:213 msgid "_Set Rating" msgstr "Nastavi _oceno" #: data/ui/collection.ui:62 data/ui/event.ui:314 data/ui/event.ui:501 #: data/ui/faces.ui:314 data/ui/media.ui:314 data/ui/photo_context.ui:63 -#: data/ui/photo.ui:305 data/ui/tags.ui:314 src/Resources.vala:223 +#: data/ui/photo.ui:303 data/ui/tags.ui:314 src/Resources.vala:223 msgid "_Unrated" msgstr "_Neocenjeno" #: data/ui/collection.ui:66 data/ui/event.ui:319 data/ui/event.ui:505 #: data/ui/faces.ui:319 data/ui/media.ui:319 data/ui/photo_context.ui:68 -#: data/ui/photo.ui:310 data/ui/tags.ui:319 src/Resources.vala:229 +#: data/ui/photo.ui:308 data/ui/tags.ui:319 src/Resources.vala:229 msgid "_Rejected" msgstr "_Zavrnjeno" #: data/ui/collection.ui:72 data/ui/event.ui:326 data/ui/event.ui:511 #: data/ui/faces.ui:326 data/ui/media.ui:326 data/ui/photo_context.ui:75 -#: data/ui/photo.ui:317 data/ui/tags.ui:326 src/Resources.vala:217 +#: data/ui/photo.ui:315 data/ui/tags.ui:326 src/Resources.vala:217 msgid "_Increase" msgstr "_Povečaj" #: data/ui/collection.ui:76 data/ui/event.ui:331 data/ui/event.ui:515 #: data/ui/faces.ui:331 data/ui/media.ui:331 data/ui/photo_context.ui:80 -#: data/ui/photo.ui:322 data/ui/tags.ui:331 src/Resources.vala:220 +#: data/ui/photo.ui:320 data/ui/tags.ui:331 src/Resources.vala:220 msgid "_Decrease" msgstr "_Zmanjšaj" #: data/ui/collection.ui:82 data/ui/event.ui:353 data/ui/event.ui:521 #: data/ui/faces.ui:353 data/ui/media.ui:353 data/ui/photo_context.ui:88 -#: data/ui/photo.ui:348 data/ui/tags.ui:353 +#: data/ui/photo.ui:346 data/ui/tags.ui:353 msgid "_Developer" msgstr "_Razvijalnik" #: data/ui/collection.ui:90 data/ui/event.ui:361 data/ui/event.ui:529 #: data/ui/faces.ui:361 data/ui/media.ui:361 data/ui/photo_context.ui:96 -#: data/ui/photo.ui:356 data/ui/tags.ui:361 src/camera/CameraBranch.vala:99 +#: data/ui/photo.ui:354 data/ui/tags.ui:361 src/camera/CameraBranch.vala:99 #: src/camera/ImportPage.vala:709 src/photos/RawSupport.vala:316 msgid "Camera" msgstr "Fotoaparat" #: data/ui/collection.ui:98 data/ui/event.ui:340 data/ui/event.ui:537 #: data/ui/faces.ui:340 data/ui/media.ui:340 data/ui/photo_context.ui:105 -#: data/ui/photo.ui:331 data/ui/tags.ui:340 src/Resources.vala:265 +#: data/ui/photo.ui:329 data/ui/tags.ui:340 src/Resources.vala:265 msgid "Edit _Title…" msgstr "Uredi _naslov …" #: data/ui/collection.ui:103 data/ui/events_directory.ui:144 #: data/ui/events_directory.ui:186 data/ui/event.ui:345 data/ui/event.ui:398 #: data/ui/event.ui:542 data/ui/faces.ui:345 data/ui/media.ui:345 -#: data/ui/photo_context.ui:110 data/ui/photo.ui:336 data/ui/tags.ui:345 +#: data/ui/photo_context.ui:110 data/ui/photo.ui:334 data/ui/tags.ui:345 #: src/Resources.vala:269 msgid "Edit _Comment…" msgstr "Uredi _opombo …" #: data/ui/collection.ui:108 data/ui/event.ui:547 data/ui/photo_context.ui:115 -#: data/ui/photo.ui:365 src/CollectionPage.vala:143 src/Resources.vala:286 +#: data/ui/photo.ui:363 src/CollectionPage.vala:143 src/Resources.vala:286 msgid "Open With E_xternal Editor" msgstr "_Odpri v zunanjem urejevalniku" #: data/ui/collection.ui:113 data/ui/event.ui:552 data/ui/photo_context.ui:120 -#: data/ui/photo.ui:370 src/CollectionPage.vala:146 src/Resources.vala:288 +#: data/ui/photo.ui:368 src/CollectionPage.vala:146 src/Resources.vala:288 msgid "Open With RA_W Editor" msgstr "Odpri z urejevalnikom R_AW" @@ -1394,8 +1397,10 @@ msgstr "Najdi" msgid "_File" msgstr "_Datoteka" +#. Check if we can write the target format +#. TODO: Check if we can actually write to the file #: data/ui/direct.ui:8 data/ui/textentrydialog.ui:33 -#: src/direct/DirectPhotoPage.vala:323 src/Resources.vala:142 +#: src/direct/DirectPhotoPage.vala:327 src/Resources.vala:142 msgid "_Save" msgstr "_Shrani" @@ -1475,52 +1480,52 @@ msgstr "_Fotografija" msgid "_Previous Photo" msgstr "_Predhodna fotografija" -#: data/ui/direct.ui:106 data/ui/photo.ui:197 +#: data/ui/direct.ui:106 data/ui/photo.ui:196 msgid "_Next Photo" msgstr "_Naslednja fotografija" -#: data/ui/direct.ui:113 data/ui/photo.ui:204 src/CollectionPage.vala:110 +#: data/ui/direct.ui:113 data/ui/photo.ui:202 src/CollectionPage.vala:110 #: src/Resources.vala:106 msgid "Rotate _Right" msgstr "Zavrti _desno" -#: data/ui/direct.ui:118 data/ui/photo.ui:209 src/CollectionPage.vala:113 +#: data/ui/direct.ui:118 data/ui/photo.ui:207 src/CollectionPage.vala:113 #: src/Resources.vala:111 msgid "Rotate _Left" msgstr "Zavrti _levo" -#: data/ui/direct.ui:123 data/ui/photo.ui:214 src/CollectionPage.vala:116 +#: data/ui/direct.ui:123 data/ui/photo.ui:212 src/CollectionPage.vala:116 #: src/Resources.vala:116 msgid "Flip Hori_zontally" msgstr "Zrcali vo_doravno" -#: data/ui/direct.ui:127 data/ui/photo.ui:218 src/CollectionPage.vala:117 +#: data/ui/direct.ui:127 data/ui/photo.ui:216 src/CollectionPage.vala:117 #: src/Resources.vala:119 msgid "Flip Verti_cally" msgstr "Zrcali _navpično" -#: data/ui/direct.ui:133 data/ui/photo.ui:224 +#: data/ui/direct.ui:133 data/ui/photo.ui:222 msgid "T_ools" msgstr "_Orodja" -#: data/ui/direct.ui:141 data/ui/photo.ui:232 src/Resources.vala:165 +#: data/ui/direct.ui:141 data/ui/photo.ui:230 src/Resources.vala:165 msgid "_Crop" msgstr "_Obreži" -#: data/ui/direct.ui:146 data/ui/photo.ui:237 +#: data/ui/direct.ui:146 data/ui/photo.ui:235 #: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:169 msgid "_Straighten" msgstr "_Poravnaj" -#: data/ui/direct.ui:151 data/ui/photo.ui:242 src/Resources.vala:173 +#: data/ui/direct.ui:151 data/ui/photo.ui:240 src/Resources.vala:173 msgid "_Red-eye" msgstr "_Rdeče oči" -#: data/ui/direct.ui:156 data/ui/photo.ui:247 src/Resources.vala:177 +#: data/ui/direct.ui:156 data/ui/photo.ui:245 src/Resources.vala:177 msgid "_Adjust" msgstr "_Prilagodi" -#: data/ui/direct.ui:169 data/ui/photo.ui:341 src/Resources.vala:276 +#: data/ui/direct.ui:169 data/ui/photo.ui:339 src/Resources.vala:276 msgid "_Adjust Date and Time…" msgstr "Prilagodi datum in _čas …" @@ -1529,7 +1534,7 @@ msgstr "Prilagodi datum in _čas …" #: data/ui/faces.ui:430 data/ui/faces.ui:433 data/ui/import_queue.ui:65 #: data/ui/import_queue.ui:68 data/ui/import.ui:183 data/ui/import.ui:186 #: data/ui/media.ui:403 data/ui/media.ui:406 data/ui/offline.ui:180 -#: data/ui/offline.ui:183 data/ui/photo.ui:391 data/ui/photo.ui:394 +#: data/ui/offline.ui:183 data/ui/photo.ui:389 data/ui/photo.ui:392 #: data/ui/tags.ui:422 data/ui/tags.ui:425 data/ui/trash.ui:189 #: data/ui/trash.ui:192 src/Resources.vala:129 msgid "_Help" @@ -1537,21 +1542,21 @@ msgstr "Pomo_č" #: data/ui/direct.ui:184 data/ui/events_directory.ui:158 data/ui/event.ui:428 #: data/ui/faces.ui:438 data/ui/import_queue.ui:73 data/ui/import.ui:191 -#: data/ui/media.ui:411 data/ui/offline.ui:188 data/ui/photo.ui:399 +#: data/ui/media.ui:411 data/ui/offline.ui:188 data/ui/photo.ui:397 #: data/ui/tags.ui:430 data/ui/trash.ui:197 msgid "_Frequently Asked Questions" msgstr "_Pogosto zastavljena vprašanja" #: data/ui/direct.ui:188 data/ui/events_directory.ui:162 data/ui/event.ui:432 #: data/ui/faces.ui:442 data/ui/import_queue.ui:77 data/ui/import.ui:195 -#: data/ui/media.ui:415 data/ui/offline.ui:192 data/ui/photo.ui:403 +#: data/ui/media.ui:415 data/ui/offline.ui:192 data/ui/photo.ui:401 #: data/ui/tags.ui:434 data/ui/trash.ui:201 msgid "_Report a Problem…" msgstr "Poročilo o _napaki …" #: data/ui/direct.ui:194 data/ui/events_directory.ui:168 data/ui/event.ui:438 #: data/ui/faces.ui:448 data/ui/import_queue.ui:83 data/ui/import.ui:201 -#: data/ui/media.ui:421 data/ui/offline.ui:198 data/ui/photo.ui:409 +#: data/ui/media.ui:421 data/ui/offline.ui:198 data/ui/photo.ui:407 #: data/ui/tags.ui:440 data/ui/trash.ui:207 src/Resources.vala:122 msgid "_About" msgstr "_O programu" @@ -1692,7 +1697,7 @@ msgstr "_Imena datotek" #: data/ui/event.ui:139 data/ui/event.ui:404 data/ui/faces.ui:139 #: data/ui/faces.ui:387 data/ui/media.ui:139 data/ui/media.ui:387 -#: data/ui/photo.ui:376 data/ui/tags.ui:139 data/ui/tags.ui:387 +#: data/ui/photo.ui:374 data/ui/tags.ui:139 data/ui/tags.ui:387 msgid "Ta_gs" msgstr "Ozna_ke" @@ -1803,11 +1808,11 @@ msgid "_Log in" msgstr "_Prijava" #: data/ui/multitextentrydialog.ui:25 data/ui/slideshow_settings.ui:38 -#: data/ui/textentrydialog.ui:19 src/AppWindow.vala:513 src/AppWindow.vala:534 +#: data/ui/textentrydialog.ui:19 src/AppWindow.vala:517 src/AppWindow.vala:538 #: src/data_imports/DataImportsUI.vala:302 #: src/data_imports/DataImportsUI.vala:420 src/Dialogs.vala:20 #: src/Dialogs.vala:28 src/Dialogs.vala:56 src/Dialogs.vala:760 -#: src/Dialogs.vala:783 src/Exporter.vala:349 src/ProfileBrowser.vala:68 +#: src/Dialogs.vala:783 src/Exporter.vala:359 src/ProfileBrowser.vala:68 #: src/ProfileBrowser.vala:100 src/publishing/PublishingUI.vala:174 #: src/publishing/PublishingUI.vala:403 src/Resources.vala:124 msgid "_Cancel" @@ -1836,11 +1841,11 @@ msgstr "Pošlji _na …" msgid "S_lideshow" msgstr "_Predstavitev" -#: data/ui/photo.ui:260 src/CollectionPage.vala:122 src/Resources.vala:157 +#: data/ui/photo.ui:258 src/CollectionPage.vala:122 src/Resources.vala:157 msgid "_Copy Color Adjustments" msgstr "_Kopiraj prilagoditve barve" -#: data/ui/photo.ui:265 src/CollectionPage.vala:125 src/Resources.vala:161 +#: data/ui/photo.ui:263 src/CollectionPage.vala:125 src/Resources.vala:161 msgid "_Paste Color Adjustments" msgstr "_Prilepi prilagoditve barve" @@ -2007,7 +2012,7 @@ msgid "Search" msgstr "Iskalnik" #: data/ui/saved_search_dialog.ui:26 src/ProfileBrowser.vala:20 -#: src/ProfileBrowser.vala:217 +#: src/ProfileBrowser.vala:221 msgid "Cancel" msgstr "Prekliči" @@ -2093,7 +2098,7 @@ msgstr "Kako dolgo je prikazana posamezna fotografija na ozadju namizja" msgid "New _Tag…" msgstr "Nova _oznaka …" -#: data/ui/slideshow_settings.ui:21 src/SlideshowPage.vala:159 +#: data/ui/slideshow_settings.ui:21 src/SlideshowPage.vala:174 msgid "Settings" msgstr "Nastavitve" @@ -2121,7 +2126,7 @@ msgstr "Čas trajanja prehoda med slikami (v sekundah)" msgid "Show t_itle" msgstr "Pokaži _naslov" -#: data/ui/slideshow_settings.ui:221 data/ui/slideshow_settings.ui:232 +#: data/ui/slideshow_settings.ui:237 data/ui/slideshow_settings.ui:248 msgid "seconds" msgstr "sekund" @@ -2306,7 +2311,7 @@ msgstr "Ni mogoče naložiti uporabniškega vmesnika: %s" msgid "Visit the Shotwell home page" msgstr "Obiščite domačo stran programa Shotwell" -#: plugins/common/Resources.vala:31 src/AppWindow.vala:588 +#: plugins/common/Resources.vala:31 src/AppWindow.vala:599 #: src/plugins/SpitInterfaces.vala:177 msgid "translator-credits" msgstr "" @@ -2403,7 +2408,7 @@ msgstr "_Odjava" #: plugins/shotwell-publishing/google_photos_publishing_options_pane.ui:195 #: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:122 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:94 -#: src/CollectionPage.vala:82 src/PhotoPage.vala:2488 +#: src/CollectionPage.vala:82 src/PhotoPage.vala:2495 msgid "_Publish" msgstr "O_bjavi" @@ -2867,19 +2872,19 @@ msgstr "Mape %s ni mogoče pripraviti za zapisovanje." msgid "Could not make directory %s writable: %s" msgstr "Mape %s ni mogoče pripraviti za zapisovanje: %s" -#: src/AppWindow.vala:47 +#: src/AppWindow.vala:52 msgid "Pin Toolbar" msgstr "Pripni orodno vrstico" -#: src/AppWindow.vala:48 +#: src/AppWindow.vala:53 msgid "Pin the toolbar open" msgstr "Pripni odprto orodno vrstico" -#: src/AppWindow.vala:53 +#: src/AppWindow.vala:58 msgid "Leave fullscreen" msgstr "Zapusti celozaslonski način" -#: src/AppWindow.vala:560 +#: src/AppWindow.vala:571 #, c-format msgid "" "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot " @@ -2892,21 +2897,21 @@ msgstr "" "\n" "%s" -#: src/AppWindow.vala:585 +#: src/AppWindow.vala:596 msgid "Visit the Shotwell web site" msgstr "Obišči spletišče Shotwell" -#: src/AppWindow.vala:598 +#: src/AppWindow.vala:609 #, c-format msgid "Unable to display help: %s" msgstr "Ni mogoče prikazati pomoči: %s" -#: src/AppWindow.vala:606 +#: src/AppWindow.vala:617 #, c-format msgid "Unable to navigate to bug database: %s" msgstr "Ni se mogoče povezati s podatkovno zbirko hroščev: %s" -#: src/AppWindow.vala:614 +#: src/AppWindow.vala:625 #, c-format msgid "Unable to display FAQ: %s" msgstr "Ni mogoče prikazati pogostih vprašanj: %s" @@ -3071,17 +3076,17 @@ msgstr "Poteka začenjanje uvoza …" msgid "Fetching photo information" msgstr "Pridobivanje podatkov o fotografiji" -#: src/camera/ImportPage.vala:1547 +#: src/camera/ImportPage.vala:1544 #, c-format msgid "Fetching preview for %s" msgstr "Pridobivanje predogleda za %s" -#: src/camera/ImportPage.vala:1656 +#: src/camera/ImportPage.vala:1653 #, c-format msgid "Unable to lock camera: %s" msgstr "Fotoaparata ni mogoče zakleniti: %s" -#: src/camera/ImportPage.vala:1741 +#: src/camera/ImportPage.vala:1738 #, c-format msgid "Delete this photo from camera?" msgid_plural "Delete these %d photos from camera?" @@ -3090,7 +3095,7 @@ msgstr[1] "Ali želite izbrisati %d sliko iz fotoaparata?" msgstr[2] "Ali želite izbrisati %d sliki iz fotoaparata?" msgstr[3] "Ali želite izbrisati %d slike iz fotoaparata?" -#: src/camera/ImportPage.vala:1744 +#: src/camera/ImportPage.vala:1741 #, c-format msgid "Delete this video from camera?" msgid_plural "Delete these %d videos from camera?" @@ -3099,7 +3104,7 @@ msgstr[1] "Ali želite izbrisati %d posnetek iz fotoaparata?" msgstr[2] "Ali želite izbrisati %d posnetka iz fotoaparata?" msgstr[3] "Ali želite izbrisati %d posnetke iz fotoaparata?" -#: src/camera/ImportPage.vala:1747 +#: src/camera/ImportPage.vala:1744 #, c-format msgid "Delete this photo/video from camera?" msgid_plural "Delete these %d photos/videos from camera?" @@ -3108,7 +3113,7 @@ msgstr[1] "Ali želite izbrisati %d sliko in posnetek iz fotoaparata?" msgstr[2] "Ali želite izbrisati %d sliki in posnetka iz fotoaparata?" msgstr[3] "Ali želite izbrisati %d slike in posnetke iz fotoaparata?" -#: src/camera/ImportPage.vala:1750 +#: src/camera/ImportPage.vala:1747 #, c-format msgid "Delete these files from camera?" msgid_plural "Delete these %d files from camera?" @@ -3117,15 +3122,15 @@ msgstr[1] "Ali želite izbrisati %d datoteko iz fotoaparata?" msgstr[2] "Ali želite izbrisati %d datoteki iz fotoaparata?" msgstr[3] "Ali želite izbrisati %d datoteke iz fotoaparata?" -#: src/camera/ImportPage.vala:1758 src/Dialogs.vala:727 +#: src/camera/ImportPage.vala:1755 src/Dialogs.vala:727 msgid "_Keep" msgstr "_Obdrži" -#: src/camera/ImportPage.vala:1777 +#: src/camera/ImportPage.vala:1774 msgid "Removing photos/videos from camera" msgstr "Odstranjevanje fotografij in posnetkov iz digitalnega fotoaparata" -#: src/camera/ImportPage.vala:1781 +#: src/camera/ImportPage.vala:1778 #, c-format msgid "Unable to delete %d photo/video from the camera due to errors." msgid_plural "Unable to delete %d photos/videos from the camera due to errors." @@ -3144,13 +3149,13 @@ msgstr "" "Ni najdenih fotografij ali posnetkov, skladnih s trenutno uveljavljenim " "filtrom" -#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85 -#: src/PhotoPage.vala:2483 src/Resources.vala:137 +#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:86 +#: src/PhotoPage.vala:2490 src/Resources.vala:137 msgid "_Print" msgstr "Na_tisni" -#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90 -#: src/PhotoPage.vala:2493 src/Resources.vala:187 +#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:91 +#: src/PhotoPage.vala:2500 src/Resources.vala:187 msgid "Set as _Desktop Background" msgstr "Slika kot _ozadje namizja" @@ -3170,7 +3175,7 @@ msgstr "Prilagodi datum in čas …" msgid "_Play" msgstr "_Predvajaj" -#: src/CollectionPage.vala:410 +#: src/CollectionPage.vala:414 msgid "Export Photo/Video" msgid_plural "Export Photos/Videos" msgstr[0] "Izvozi fotografije/posnetke" @@ -3178,7 +3183,7 @@ msgstr[1] "Izvozi fotografijo/posnetek" msgstr[2] "Izvozi fotografiji/posnetka" msgstr[3] "Izvozi fotografije/posnetke" -#: src/CollectionPage.vala:412 +#: src/CollectionPage.vala:416 msgid "Export Photo" msgid_plural "Export Photos" msgstr[0] "Izvozi fotografije" @@ -3186,27 +3191,27 @@ msgstr[1] "Izvozi fotografijo" msgstr[2] "Izvozi fotografiji" msgstr[3] "Izvozi fotografije" -#: src/CollectionPage.vala:499 src/CollectionPage.vala:515 +#: src/CollectionPage.vala:503 src/CollectionPage.vala:519 msgid "Rotating" msgstr "Vrtenje" -#: src/CollectionPage.vala:499 src/CollectionPage.vala:515 +#: src/CollectionPage.vala:503 src/CollectionPage.vala:519 msgid "Undoing Rotate" msgstr "Razveljavljanje vrtenja" -#: src/CollectionPage.vala:524 +#: src/CollectionPage.vala:528 msgid "Flipping Horizontally" msgstr "Zrcaljenje vodoravno" -#: src/CollectionPage.vala:525 +#: src/CollectionPage.vala:529 msgid "Undoing Flip Horizontally" msgstr "Razveljavljanje vodoravnega zrcaljenja" -#: src/CollectionPage.vala:534 +#: src/CollectionPage.vala:538 msgid "Flipping Vertically" msgstr "Zrcaljenje navpično" -#: src/CollectionPage.vala:535 +#: src/CollectionPage.vala:539 msgid "Undoing Flip Vertically" msgstr "Razveljavljanje navpičnega zrcaljenja" @@ -3768,7 +3773,7 @@ msgstr[3] "" msgid "Export Video" msgstr "Izvozi posnetke" -#: src/Dialogs.vala:70 src/PhotoPage.vala:3018 +#: src/Dialogs.vala:70 src/PhotoPage.vala:3025 msgctxt "Dialog Title" msgid "Export Photo" msgstr "Izvozi fotografijo" @@ -4622,17 +4627,17 @@ msgstr "Širina" msgid "Height" msgstr "Višina" -#: src/direct/DirectPhotoPage.vala:99 +#: src/direct/DirectPhotoPage.vala:100 #, c-format msgid "%s does not exist." msgstr "%s ne obstaja." -#: src/direct/DirectPhotoPage.vala:101 +#: src/direct/DirectPhotoPage.vala:102 #, c-format msgid "%s is not a file." msgstr "%s ni datoteka." -#: src/direct/DirectPhotoPage.vala:103 +#: src/direct/DirectPhotoPage.vala:104 #, c-format msgid "" "%s does not support the file format of\n" @@ -4641,40 +4646,48 @@ msgstr "" "%s ne podpira vrste datoteke\n" "%s." -#: src/direct/DirectPhotoPage.vala:120 +#: src/direct/DirectPhotoPage.vala:121 #, c-format msgid "Unable open photo %s. Sorry." msgstr "Fotografije %s ni mogoče odpreti." -#: src/direct/DirectPhotoPage.vala:323 +#: src/direct/DirectPhotoPage.vala:327 msgid "_Save a Copy" msgstr "_Shrani kopijo" -#: src/direct/DirectPhotoPage.vala:326 +#: src/direct/DirectPhotoPage.vala:330 #, c-format msgid "Lose changes to %s?" msgstr "Zavrzi spremembe %s?" -#: src/direct/DirectPhotoPage.vala:327 +#: src/direct/DirectPhotoPage.vala:331 msgid "Close _without Saving" msgstr "Zapri _brez shranjevanja" -#: src/direct/DirectPhotoPage.vala:360 +#: src/direct/DirectPhotoPage.vala:367 #, c-format msgid "Error while saving to %s: %s" msgstr "Napaka med shranjevanjem v: %s: %s" -#: src/direct/DirectPhotoPage.vala:390 src/direct/DirectPhotoPage.vala:411 +#: src/direct/DirectPhotoPage.vala:399 src/direct/DirectPhotoPage.vala:425 msgid "Save As" msgstr "Shrani kot" +#: src/direct/DirectPhotoPage.vala:414 +msgid "Supported image formats" +msgstr "Podprte vrste datotek" + +#: src/direct/DirectPhotoPage.vala:423 +msgid "All files" +msgstr "Vse datoteke" + #. verify this is a directory #: src/DirectoryMonitor.vala:891 #, c-format msgid "Unable to monitor %s: Not a directory (%s)" msgstr "Ni mogoče spremljati %s: to ni mapa (%s)" -#: src/DragAndDropHandler.vala:161 +#: src/DragAndDropHandler.vala:165 msgid "Photos cannot be exported to this directory." msgstr "Fotografij ni mogoče izvoziti v to mapo." @@ -4791,92 +4804,92 @@ msgstr "30 × 40 cm" msgid "A3 (297 × 420 mm)" msgstr "A3 (297 × 420 mm)" -#: src/editing_tools/EditingTools.vala:1868 src/Properties.vala:407 +#: src/editing_tools/EditingTools.vala:1870 src/Properties.vala:407 msgid "Size:" msgstr "Velikost:" -#: src/editing_tools/EditingTools.vala:1883 +#: src/editing_tools/EditingTools.vala:1885 msgid "Close the red-eye tool" msgstr "Zapri orodje rdečih oči" -#: src/editing_tools/EditingTools.vala:1886 +#: src/editing_tools/EditingTools.vala:1888 msgid "Remove any red-eye effects in the selected region" msgstr "Odstrani morebitne učinke rdečih oči v izbranemu področju" -#: src/editing_tools/EditingTools.vala:2227 +#: src/editing_tools/EditingTools.vala:2229 #: src/editing_tools/StraightenTool.vala:102 msgid "_Reset" msgstr "_Ponastavi" #. fit both on the top line, emit and move on -#: src/editing_tools/EditingTools.vala:2241 src/Properties.vala:448 +#: src/editing_tools/EditingTools.vala:2243 src/Properties.vala:448 #: src/Properties.vala:452 src/Properties.vala:459 msgid "Exposure:" msgstr "Osvetlitev:" -#: src/editing_tools/EditingTools.vala:2250 +#: src/editing_tools/EditingTools.vala:2252 msgid "Contrast:" msgstr "Kontrast:" -#: src/editing_tools/EditingTools.vala:2259 +#: src/editing_tools/EditingTools.vala:2261 msgid "Saturation:" msgstr "Nasičenost:" -#: src/editing_tools/EditingTools.vala:2268 +#: src/editing_tools/EditingTools.vala:2270 msgid "Tint:" msgstr "Črnilo:" -#: src/editing_tools/EditingTools.vala:2278 +#: src/editing_tools/EditingTools.vala:2280 msgid "Temperature:" msgstr "Temperatura:" -#: src/editing_tools/EditingTools.vala:2287 +#: src/editing_tools/EditingTools.vala:2289 msgid "Shadows:" msgstr "Sence:" #. FIXME: Hack to make the slider the same length as the other. Find out why it is aligned #. Differently (probably because it only has positive values) -#: src/editing_tools/EditingTools.vala:2298 +#: src/editing_tools/EditingTools.vala:2300 msgid "Highlights:" msgstr "Poudarjanje:" -#: src/editing_tools/EditingTools.vala:2355 +#: src/editing_tools/EditingTools.vala:2357 msgid "Reset Colors" msgstr "Ponastavi barve" -#: src/editing_tools/EditingTools.vala:2355 +#: src/editing_tools/EditingTools.vala:2357 msgid "Reset all color adjustments to original" msgstr "Ponastavi vse prilagoditve barve na izvirno" -#: src/editing_tools/EditingTools.vala:2714 +#: src/editing_tools/EditingTools.vala:2716 msgid "Temperature" msgstr "Temperatura" -#: src/editing_tools/EditingTools.vala:2726 +#: src/editing_tools/EditingTools.vala:2728 msgid "Tint" msgstr "Črnilo" -#: src/editing_tools/EditingTools.vala:2738 +#: src/editing_tools/EditingTools.vala:2740 msgid "Contrast" msgstr "Kontrast" -#: src/editing_tools/EditingTools.vala:2752 +#: src/editing_tools/EditingTools.vala:2754 msgid "Saturation" msgstr "Nasičenost" -#: src/editing_tools/EditingTools.vala:2765 +#: src/editing_tools/EditingTools.vala:2767 msgid "Exposure" msgstr "Osvetljenost" -#: src/editing_tools/EditingTools.vala:2778 +#: src/editing_tools/EditingTools.vala:2780 msgid "Shadows" msgstr "Sence" -#: src/editing_tools/EditingTools.vala:2791 +#: src/editing_tools/EditingTools.vala:2793 msgid "Highlights" msgstr "Poudarjanje" -#: src/editing_tools/EditingTools.vala:2801 +#: src/editing_tools/EditingTools.vala:2803 msgid "Contrast Expansion" msgstr "Razširitev kontrasta" @@ -4918,43 +4931,35 @@ msgstr "Brez datuma" msgid "Event %s" msgstr "Dogodek %s" -#: src/Exporter.vala:237 src/Exporter.vala:292 +#: src/Exporter.vala:238 src/Exporter.vala:302 #, c-format msgid "Unable to generate a temporary file for %s: %s" msgstr "Ni mogoče ustvariti začasne datoteke za %s: %s" -#: src/Exporter.vala:329 +#: src/Exporter.vala:339 msgid "Exporting" msgstr "Izvažanje" -#: src/Exporter.vala:347 +#: src/Exporter.vala:357 #, c-format msgid "File %s already exists. Replace?" msgstr "Datoteka %s že obstaja. Ali jo želite zamenjati?" -#: src/Exporter.vala:349 +#: src/Exporter.vala:359 msgid "_Skip" msgstr "Pre_skoči" -#: src/Exporter.vala:349 +#: src/Exporter.vala:359 msgid "Rename" msgstr "Preimenuj" -#: src/Exporter.vala:349 -msgid "Rename All" -msgstr "Preimenuj vse" - -#: src/Exporter.vala:349 +#: src/Exporter.vala:359 msgid "_Replace" msgstr "_Zamenjaj" -#: src/Exporter.vala:349 -msgid "Replace _All" -msgstr "Zamenjaj _vse" - -#: src/Exporter.vala:349 -msgid "Export" -msgstr "Izvozi" +#: src/Exporter.vala:359 +msgid "Export file conflict" +msgstr "Spor pri izvozu datotek" #: src/faces/FacesTool.vala:114 msgid "Detect faces…" @@ -5086,23 +5091,24 @@ msgstr "" "Ali želite nadaljevati z uvažanjem?" #. TODO: Specify which directory/file. -#: src/library/LibraryWindow.vala:772 +#. var message = ngettext("Photos cannot be imported from this folder", "Photos cannot be imported from these folders", rejected.size) +#: src/library/LibraryWindow.vala:783 msgid "Photos cannot be imported from this directory." msgstr "Iz te mape ni mogoče uvoziti fotografij." -#: src/library/LibraryWindow.vala:995 src/library/LibraryWindow.vala:1006 +#: src/library/LibraryWindow.vala:1005 src/library/LibraryWindow.vala:1016 msgid "Updating library…" msgstr "Poteka posodabljanje knjižnice …" -#: src/library/LibraryWindow.vala:1012 +#: src/library/LibraryWindow.vala:1022 msgid "Preparing to auto-import photos…" msgstr "Poteka priprava na samodejno uvažanje slik …" -#: src/library/LibraryWindow.vala:1017 +#: src/library/LibraryWindow.vala:1027 msgid "Auto-importing photos…" msgstr "Samodejno uvažanje fotografij …" -#: src/library/LibraryWindow.vala:1025 +#: src/library/LibraryWindow.vala:1035 msgid "Writing metadata to files…" msgstr "Poteka zapisovanje metapodatkov v datoteke …" @@ -5170,69 +5176,69 @@ msgstr "Med poskusom preverjanja podatkovne zbirke je prišlo do napake: %s" msgid "Loading Shotwell" msgstr "Nalaganje programa" -#: src/main.vala:348 +#: src/main.vala:408 msgid "Path to Shotwell’s private data" msgstr "Pot do zasebnih podatkov programa" -#: src/main.vala:348 +#: src/main.vala:408 msgid "DIRECTORY" msgstr "MAPA" -#: src/main.vala:349 +#: src/main.vala:409 msgid "Do not monitor library directory at runtime for changes" msgstr "Ne spremljajte knjižnic v času izvajanja za spremembe" -#: src/main.vala:350 +#: src/main.vala:410 msgid "Don’t display startup progress meter" msgstr "Ne prikaži merilnika poteka zagona" -#: src/main.vala:351 +#: src/main.vala:411 msgid "Show the application’s version" msgstr "Pokaži različico programa" -#: src/main.vala:352 +#: src/main.vala:412 msgid "Start the application in fullscreen mode" msgstr "Zaženi program v celozaslonskem načinu" -#: src/main.vala:353 +#: src/main.vala:413 msgid "Print the metadata of the image file" msgstr "Natisni metapodatke slikovne datoteke" -#: src/main.vala:354 +#: src/main.vala:414 msgid "Name for a custom profile" msgstr "Naziv profila po meri" -#: src/main.vala:354 +#: src/main.vala:414 msgid "PROFILE" msgstr "PROFIL" -#: src/main.vala:355 +#: src/main.vala:415 msgid "Start with a browser of available profiles" msgstr "Zaženi z brskalnikom razpoložljivih profilov" -#: src/main.vala:356 +#: src/main.vala:416 msgid "If PROFILE given with --profile does not exist, create it" msgstr "Če profil, podan z zastavico --profile ne obstaja, ga ustvari" -#: src/main.vala:357 +#: src/main.vala:417 msgid "Show available profiles" msgstr "Prikaži razpoložljive profile" #. init GTK (valac has already called g_threads_init()) -#: src/main.vala:398 +#: src/main.vala:458 msgid "[FILE]" msgstr "[DATOTEKA]" -#: src/main.vala:403 +#: src/main.vala:463 #, c-format msgid "Run “%s --help” to see a full list of available command line options.\n" msgstr "Za popoln seznam možnosti ukazne vrstice zaženite ukaz »%s --help«.\n" -#: src/main.vala:410 +#: src/main.vala:472 msgid "Choose Shotwell's profile" msgstr "Izberite profil za Shotwell" -#: src/main.vala:436 +#: src/main.vala:498 #, c-format msgid "Profile %s does not exist. Did you mean to pass --create as well?" msgstr "" @@ -5267,31 +5273,31 @@ msgstr "" "%s" #. previous button -#: src/PhotoPage.vala:546 +#: src/PhotoPage.vala:553 msgid "Previous photo" msgstr "Predhodna fotografija" #. next button -#: src/PhotoPage.vala:552 +#: src/PhotoPage.vala:559 msgid "Next photo" msgstr "Naslednja fotografija" -#: src/PhotoPage.vala:1860 +#: src/PhotoPage.vala:1867 #, c-format msgid "Photo source file missing: %s" msgstr "Izvirna datoteka fotografije manjka: %s" -#: src/PhotoPage.vala:2893 +#: src/PhotoPage.vala:2900 msgctxt "Dialog Title" msgid "Remove From Library" msgstr "Odstrani iz knjižnice" -#: src/PhotoPage.vala:2894 +#: src/PhotoPage.vala:2901 msgctxt "Dialog Title" msgid "Removing Photo From Library" msgstr "Odstranjevanje fotografije iz knjižnice" -#: src/PhotoPage.vala:3038 +#: src/PhotoPage.vala:3045 #, c-format msgid "Unable to export %s: %s" msgstr "%s ni mogoče izvoziti: %s" @@ -5352,7 +5358,8 @@ msgstr "TIFF" msgid "WebP" msgstr "WebP" -#: src/Photo.vala:3811 +#. TRANSLATORS: "modified" here is part of a file name that was changed with another image tool outside of Shotwell. Note that there are potential issues with UTF-8 characters +#: src/Photo.vala:3812 msgid "modified" msgstr "spremenjeno" @@ -5433,7 +5440,7 @@ msgstr "" msgid "Create" msgstr "Ustvari" -#: src/ProfileBrowser.vala:24 src/ProfileBrowser.vala:255 +#: src/ProfileBrowser.vala:24 src/ProfileBrowser.vala:259 msgid "Create new Profile" msgstr "Ustvari nov profil" @@ -5449,7 +5456,7 @@ msgstr "Mapa knjižnice" msgid "Choose Library Folder" msgstr "Izberite mapo knjižnice" -#: src/ProfileBrowser.vala:80 src/ProfileBrowser.vala:187 +#: src/ProfileBrowser.vala:80 src/ProfileBrowser.vala:189 msgid "Data Folder" msgstr "Mapa s podatki" @@ -5461,26 +5468,26 @@ msgstr "Izberite mapo s podatki" msgid "This is the currently active profile" msgstr "To je trenutno aktivni profil" -#: src/ProfileBrowser.vala:199 +#: src/ProfileBrowser.vala:203 msgid "Remove Profile" msgstr "Odstrani profil" -#: src/ProfileBrowser.vala:201 +#: src/ProfileBrowser.vala:205 msgid "Remove this profile" msgstr "Odstrani ta profil" -#: src/ProfileBrowser.vala:213 +#: src/ProfileBrowser.vala:217 #, c-format msgid "Remove profile “%s”" msgstr "Odstrani profil »%s«" -#: src/ProfileBrowser.vala:214 +#: src/ProfileBrowser.vala:218 msgid "" "None of the options will remove any of the images associated with this " "profile" msgstr "Nobena od možnosti ne bo odstranila slik, povezanih s tem profilom." -#: src/ProfileBrowser.vala:215 +#: src/ProfileBrowser.vala:219 #, c-format msgid "" "<b><span size=\"larger\">%s</span></b>\n" @@ -5489,11 +5496,11 @@ msgstr "" "<b><span size=\"larger\">%s</span></b>\n" "<span weight=\"light\">%s</span>" -#: src/ProfileBrowser.vala:217 +#: src/ProfileBrowser.vala:221 msgid "Remove profile and files" msgstr "Odstrani profil in datoteke" -#: src/ProfileBrowser.vala:217 +#: src/ProfileBrowser.vala:221 msgid "Remove profile only" msgstr "Odstrani samo profil" @@ -6315,7 +6322,7 @@ msgctxt "MultimonthFormat" msgid "%a %b %d, %Y" msgstr "%a, %d. %m. %Y" -#: src/Screensaver.vala:18 src/SlideshowPage.vala:117 +#: src/Screensaver.vala:18 src/SlideshowPage.vala:128 msgid "Slideshow" msgstr "Predstavitev" @@ -6544,44 +6551,44 @@ msgstr "" #. Set up toolbar #. add toolbar buttons -#: src/SlideshowPage.vala:136 +#: src/SlideshowPage.vala:151 msgid "Back" msgstr "Nazaj" -#: src/SlideshowPage.vala:138 +#: src/SlideshowPage.vala:153 msgid "Go to the previous photo" msgstr "Skoči na predhodno sliko" -#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:250 +#: src/SlideshowPage.vala:158 src/SlideshowPage.vala:265 msgid "Pause" msgstr "Premor" -#: src/SlideshowPage.vala:145 src/SlideshowPage.vala:251 +#: src/SlideshowPage.vala:160 src/SlideshowPage.vala:266 msgid "Pause the slideshow" msgstr "Naredi premor predstavitve" -#: src/SlideshowPage.vala:150 +#: src/SlideshowPage.vala:165 msgid "Next" msgstr "Naslednja" -#: src/SlideshowPage.vala:152 +#: src/SlideshowPage.vala:167 msgid "Go to the next photo" msgstr "Skoči na naslednjo fotografijo" -#: src/SlideshowPage.vala:160 +#: src/SlideshowPage.vala:175 msgid "Change slideshow settings" msgstr "Spremeni nastavitve predstavitve" #. An entire slideshow set might be missing, so check for a loop. -#: src/SlideshowPage.vala:214 +#: src/SlideshowPage.vala:229 msgid "All photo source files are missing." msgstr "Manjkajo vse izvorne datoteke fotografije." -#: src/SlideshowPage.vala:246 +#: src/SlideshowPage.vala:261 msgid "Play" msgstr "Predvajaj" -#: src/SlideshowPage.vala:247 +#: src/SlideshowPage.vala:262 msgid "Continue the slideshow" msgstr "Nadaljuj s predstavitvijo" diff --git a/src/Application.vala b/src/Application.vala index 59bae36..d9edcaf 100644 --- a/src/Application.vala +++ b/src/Application.vala @@ -4,7 +4,75 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ +[DBus(name = "org.gnome.Shotwell.Authenticate")] +public interface AuthenticationReceiver : Object { + public abstract void callback(string url) throws DBusError, IOError; +} + +[DBus(name = "org.gnome.Shotwell.Authenticate")] +internal class AuthenticatorReceiverApp : Gtk.Application, AuthenticationReceiver { + private Gee.HashMap<string, Spit.Publishing.AuthenticatedCallback> + pending_auth_requests = new Gee.HashMap<string, Spit.Publishing.AuthenticatedCallback>(); + + public AuthenticatorReceiverApp() { + Object(application_id: "org.gnome.Shotwell", flags: GLib.ApplicationFlags.HANDLES_OPEN | + GLib.ApplicationFlags.HANDLES_COMMAND_LINE); + } + public override bool dbus_register(DBusConnection connection, string object_path) throws Error { + try { + connection.register_object(object_path, this); + } catch (IOError e) { + warning("Failed to register authentication helper on session connection: %s", e.message); + } + return true; + } + + + internal void register_auth_callback(string cookie, Spit.Publishing.AuthenticatedCallback cb) { + pending_auth_requests[cookie] = cb; + } + + internal void unregister_auth_callback(string cookie) { + pending_auth_requests.unset(cookie); + } + + public void callback(string callback_url) throws DBusError, IOError { + try { + var uri = Uri.parse(callback_url, UriFlags.NONE); + debug("Got authentication callback uri: %s", callback_url); + // See if something is waiting for a pending authentication + var query = uri.get_query(); + if (query == null || query == "") { + debug("Callback does not have parameters. Not accepting"); + + return; + } + var uri_params = Uri.parse_params(uri.get_query()); + if ("sw_auth_cookie" in uri_params) { + var cookie = uri_params["sw_auth_cookie"]; + if (pending_auth_requests.has_key(cookie)) { + pending_auth_requests[cookie].authenticated(uri_params); + LibraryWindow.get_app().present(); + } else { + debug("No call-back registered for cookie %s, probably user cancelled", cookie); + } + } else if (uri.get_scheme().has_prefix("com.googleusercontent.apps")) { + if (pending_auth_requests.has_key(uri.get_scheme())) { + pending_auth_requests[uri.get_scheme()].authenticated(uri_params); + } else { + debug("No call-back registered for cookie %s, probably user cancelled", uri.get_scheme()); + } + } + } catch (Error error) { + warning("Got invalid authentication call-back: %s", callback_url); + } + } +} + public class Application { + public interface AuthCallback : Object { + public abstract void authenticated(HashTable<string, string> params); + } private static Application instance = null; private Gtk.Application system_app = null; private int system_app_run_retval = 0; @@ -36,20 +104,21 @@ public class Application { private bool running = false; private bool exiting_fired = false; + Gee.HashMap<string, AuthCallback> pending_auth_requests = new Gee.HashMap<string, AuthCallback>(); + private Application(bool is_direct) { if (is_direct) { // we allow multiple instances of ourself in direct mode, so DON'T // attempt to be unique. We don't request any command-line handling // here because this is processed elsewhere, and we don't need to handle // command lines from remote instances, since we don't care about them. - system_app = new Gtk.Application("org.gnome.Shotwell-direct", GLib.ApplicationFlags.HANDLES_OPEN | + system_app = new Gtk.Application("org.gnome.Shotwell-Viewer", GLib.ApplicationFlags.HANDLES_OPEN | GLib.ApplicationFlags.NON_UNIQUE); } else { // we've been invoked in library mode; set up for uniqueness and handling // of incoming command lines from remote instances (needed for getting // storage device and camera mounts). - system_app = new Gtk.Application("org.gnome.Shotwell", GLib.ApplicationFlags.HANDLES_OPEN | - GLib.ApplicationFlags.HANDLES_COMMAND_LINE); + system_app = new AuthenticatorReceiverApp(); } // GLib will assert if we don't do this... @@ -63,12 +132,46 @@ public class Application { if (!direct) { system_app.command_line.connect(on_command_line); + var action = new SimpleAction("authenticated", VariantType.STRING); + system_app.add_action(action); + action.activate.connect((a, p) => { + try { + var uri = Uri.parse(p.get_string(), UriFlags.NONE); + debug("Got authentication callback uri: %s", p.get_string()); + // See if something is waiting for a pending authentication + var uri_params = Uri.parse_params(uri.get_query()); + if ("sw_auth_cookie" in uri_params) { + var cookie = uri_params["sw_auth_cookie"]; + if (pending_auth_requests.has_key(cookie)) { + pending_auth_requests[cookie].authenticated(uri_params); + } else { + debug("No call-back registered for cookie %s, probably user cancelled", cookie); + } + } + } catch (Error error) { + warning("Got invalid authentication call-back: %s", p.get_string()); + } + }); } system_app.activate.connect(on_activated); system_app.startup.connect(on_activated); } + public static void register_auth_callback(string cookie, Spit.Publishing.AuthenticatedCallback cb) { + var instance = get_instance(); + if (!instance.direct) { + ((AuthenticatorReceiverApp)instance.system_app).register_auth_callback(cookie, cb); + } + } + + public static void unregister_auth_callback(string cookie) { + var instance = get_instance(); + if (!instance.direct) { + ((AuthenticatorReceiverApp)instance.system_app).unregister_auth_callback(cookie); + } + } + public static double get_scale() { var instance = get_instance().system_app; unowned GLib.List<Gtk.Window> windows = instance.get_windows(); diff --git a/src/authenticator.vala b/src/authenticator.vala new file mode 100644 index 0000000..55f3321 --- /dev/null +++ b/src/authenticator.vala @@ -0,0 +1,40 @@ +// SPDX-License-Identifer: LGPL-2.1-or-later +// SPDX-FileCopyrightText: 2022 Jens Georg <mail@jensge.org> + +[DBus(name = "org.gnome.Shotwell.Authenticate")] +public interface AuthenticationReceiver : Object { + public abstract void callback(string url) throws DBusError, IOError; +} + +static int main(string[] args) { + AuthenticationReceiver receiver; + + if (args.length != 2) { + print("Usage: %s <callback-uri>\n", args[0]); + return 1; + } + + try { + var uri = Uri.parse(args[1], UriFlags.NONE); + var scheme = uri.get_scheme(); + + if (scheme != "shotwell-oauth2" && !scheme.has_prefix("com.googleusercontent.apps")) { + critical("Invalid scheme in callback URI \"%s\"", args[1]); + return 1; + } + } catch (Error e) { + critical("Invalid uri: \"%s\": %s", args[1], e.message); + return 1; + } + + try { + receiver = Bus.get_proxy_sync (BusType.SESSION, "org.gnome.Shotwell", "/org/gnome/Shotwell"); + receiver.callback(args[1]); + } catch (Error e) { + critical("Could not connect to remote shotwell instance: %s", e.message); + + return 1; + } + + return 0; +}
\ No newline at end of file diff --git a/src/direct/DirectWindow.vala b/src/direct/DirectWindow.vala index baf6124..d39e83d 100644 --- a/src/direct/DirectWindow.vala +++ b/src/direct/DirectWindow.vala @@ -40,7 +40,7 @@ public class DirectWindow : AppWindow { } public void update_title(File file, bool modified) { - title = "%s%s (%s) - %s".printf((modified) ? "*" : "", file.get_basename(), + title = "%s%s (%s) - %s".printf((modified) ? "•" : "", file.get_basename(), get_display_pathname(file.get_parent()), Resources.APP_TITLE); } @@ -66,6 +66,9 @@ public class DirectWindow : AppWindow { } protected override void on_quit() { + if (!get_direct_page().check_quit()) + return; + Config.Facade.get_instance().set_direct_window_state(maximized, dimensions); base.on_quit(); diff --git a/src/main.vala b/src/main.vala index d07b7f5..f4eed30 100644 --- a/src/main.vala +++ b/src/main.vala @@ -373,7 +373,6 @@ void editing_exec(string filename, bool fullscreen) { DirectWindow direct_window = new DirectWindow(initial_file); direct_window.show_all(); - direct_window.maximize(); debug("%lf seconds to Gtk.main()", startup_timer.elapsed()); diff --git a/src/meson.build b/src/meson.build index 460092e..25f967a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -12,17 +12,25 @@ sw_graphics_processor = static_library('shotwell-graphics-processor', vala_args : '--disable-assert', install : false) -processor = executable('shotwell-graphics-processor', +executable('shotwell-graphics-processor', ['graphics-processor.vala'], dependencies: [gio, gdk, gee], link_with: sw_graphics_processor) +executable('shotwell-authenticator', + [ + 'authenticator.vala' + ], + dependencies: [gio], + include_directories: config_incdir, + install: true, + install_dir : join_paths(get_option('libexecdir'), 'shotwell') +) + shotwell_deps = [gio, gee, sqlite, gtk, sqlite, posix, gphoto2, gstreamer_pbu, gudev, gexiv2, gmodule, libraw, libexif, sw_plugin] -shotwell_libs = [sw_graphics_processor] - face_sources = (['faces/FacesBranch.vala', 'faces/FacePage.vala', 'faces/FaceShape.vala', diff --git a/src/plugins/PublishingInterfaces.vala b/src/plugins/PublishingInterfaces.vala index 05b161f..84cb943 100644 --- a/src/plugins/PublishingInterfaces.vala +++ b/src/plugins/PublishingInterfaces.vala @@ -92,6 +92,9 @@ public errordomain PublishingError { SSL_FAILED } +public interface AuthenticatedCallback : Object { + public abstract void authenticated(HashTable<string, string> params); +} /** * Represents a connection to a publishing service. * @@ -503,6 +506,10 @@ public interface PluginHost : GLib.Object, Spit.HostInterface { */ public abstract Spit.Publishing.Publisher.MediaType get_publishable_media_type(); + + public abstract void register_auth_callback(string cookie, AuthenticatedCallback callback); + public abstract void unregister_auth_callback(string cookie); + // // For future expansion. // diff --git a/src/publishing/PublishingPluginHost.vala b/src/publishing/PublishingPluginHost.vala index 7804924..88b99e7 100644 --- a/src/publishing/PublishingPluginHost.vala +++ b/src/publishing/PublishingPluginHost.vala @@ -33,6 +33,14 @@ public class ConcretePublishingHost : Plugins.StandardHostInterface, this.active_publisher = service.create_publisher_with_account(this, account); } + public void register_auth_callback(string cookie, AuthenticatedCallback callback) { + Application.register_auth_callback(cookie, callback); + } + + public void unregister_auth_callback(string cookie) { + Application.unregister_auth_callback(cookie); + } + public string get_current_profile_id() { return Shotwell.ProfileManager.get_instance().id(); } diff --git a/src/threads/Workers.vala b/src/threads/Workers.vala index 60751a9..42d696c 100644 --- a/src/threads/Workers.vala +++ b/src/threads/Workers.vala @@ -18,7 +18,6 @@ public class Workers { private ThreadPool<void *> thread_pool; private AsyncQueue<BackgroundJob> queue = new AsyncQueue<BackgroundJob>(); private EventSemaphore empty_event = new EventSemaphore(); - private int enqueued = 0; public Workers(uint max_threads, bool exclusive) { if (max_threads <= 0 && max_threads != UNLIMITED_THREADS) @@ -51,10 +50,7 @@ public class Workers { public void enqueue(BackgroundJob job) { empty_event.reset(); - lock (queue) { - queue.push_sorted(job, BackgroundJob.priority_compare_func); - enqueued++; - } + queue.push_sorted(job, BackgroundJob.priority_compare_func); try { thread_pool.add(job); @@ -76,21 +72,19 @@ public class Workers { // Returns the number of BackgroundJobs on the queue, not including active jobs. public int get_pending_job_count() { - lock (queue) { - return enqueued; - } + return queue.length(); } private void thread_start(void *ignored) { BackgroundJob? job; bool empty; - lock (queue) { - job = queue.try_pop(); - assert(job != null); + + queue.lock(); + job = queue.try_pop_unlocked(); + assert(job != null); - assert(enqueued > 0); - empty = (--enqueued == 0); - } + empty = queue.length_unlocked() == 0; + queue.unlock(); if (!job.is_cancelled()) job.execute(); diff --git a/uncrustify.cfg b/uncrustify.cfg new file mode 100644 index 0000000..621657f --- /dev/null +++ b/uncrustify.cfg @@ -0,0 +1,94 @@ +# +# Shotwell indentation rules +# + +code_width = 150 +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size +indent_label = 2 # pos: absolute col, neg: relative column +indent_namespace = True +indent_class = True +indent_switch_case = indent_columns +# indent_align_string = False # align broken strings +# indent_brace = 0 +indent_func_call_param = true # use indent tabstop + +nl_enum_brace = remove # "enum {" vs "enum \n {" +nl_union_brace = remove # "union {" vs "union \n {" +nl_struct_brace = remove # "struct {" vs "struct \n {" +nl_do_brace = remove # "do {" vs "do \n {" +nl_if_brace = remove # "if () {" vs "if () \n {" +nl_for_brace = remove # "for () {" vs "for () \n {" +nl_else_brace = remove # "else {" vs "else \n {" +nl_while_brace = remove # "while () {" vs "while () \n {" +nl_switch_brace = remove # "switch () {" vs "switch () \n {" +nl_var_def_blk_end_func_top = 1 +nl_before_case = 1 +nl_fcall_brace = remove # "foo() {" vs "foo()\n{" +nl_fdef_brace = remove # "int foo() {" vs "int foo()\n{" +nl_before_return = true +# nl_after_return = TRUE +nl_brace_while = remove +nl_brace_else = remove +nl_squeeze_ifdef = TRUE + +mod_paren_on_return = remove # "return 1;" vs "return (1);" +mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" +mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" +mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" +mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" + +sp_before_semi = remove +sp_paren_paren = remove # space between (( and )) +sp_return_paren = remove # "return (1);" vs "return(1);" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = force # "{ 1 }" vs "{1}" +sp_inside_braces_struct = force # "{ 1 }" vs "{1}" +sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_inside_paren = remove +sp_inside_fparen = remove +sp_inside_sparen = remove +sp_inside_for = remove +sp_inside_square = remove +sp_before_square = remove +#sp_type_func = ignore +sp_assign = force +sp_arith = force +sp_bool = force +sp_compare = force +sp_assign = force +sp_after_comma = force +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_else_brace = add +sp_brace_else = add + +# align_with_tabs = FALSE # use tabs to align +# align_on_tabstop = FALSE # align on tabstops +# align_enum_equ_span = 4 +# align_nl_cont = 1 +# align_var_def_span = 2 +# align_var_def_inline = TRUE +# align_var_def_star = TRUE +# align_var_def_colon = TRUE +# align_assign_span = 1 +# align_struct_init_span = 3 +# align_var_struct_span = 3 +# align_right_cmt_span = 3 +# align_pp_define_span = 3 +# align_pp_define_gap = 4 +# align_number_right = TRUE +# align_typedef_span = 5 +# align_typedef_gap = 3 + +cmt_star_cont = TRUE + +eat_blanks_before_close_brace = TRUE +eat_blanks_after_open_brace = TRUE + diff --git a/uncrustify.vala.cfg b/uncrustify.vala.cfg deleted file mode 100644 index f9aa4f5..0000000 --- a/uncrustify.vala.cfg +++ /dev/null @@ -1,1654 +0,0 @@ -# Uncrustify 0.60 -# Rules for vala -# Version: 0.5 -# Refactored to match the style used on this project: https://github.com/GNOME/vala - -# -# General options -# - -# The type of line endings -newlines = auto # auto/lf/crlf/cr - -# The original size of tabs in the input -input_tab_size = 8 # number - -# The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 4 # number - -# The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number - -# Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number - -# Allow interpreting '>=' and '>>=' as part of a template in 'void f(list<list<B>>=val);'. -# If true (default), 'assert(x<0 && y>=3)' will be broken. -# Improvements to template detection may make this option obsolete. -tok_split_gte = false # false/true - -# Control what to do with the UTF-8 BOM (recommend 'remove') -utf8_bom = ignore # ignore/add/remove/force - -# If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8 -utf8_byte = false # false/true - -# Force the output encoding to UTF-8 -utf8_force = false # false/true - -# -# Indenting -# - -# The number of columns to indent per level. -# Usually 2, 3, 4, or 8. -indent_columns = 4 # number - -# The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. -# For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level -indent_continue = 0 # number - -# How to use tabs when indenting code -# 0=spaces only -# 1=indent with tabs to brace level, align with spaces -# 2=indent and align with tabs, using spaces when not on a tabstop -indent_with_tabs = 0 # number - -# Comments that are not a brace level are indented with tabs on a tabstop. -# Requires indent_with_tabs=2. If false, will use spaces. -indent_cmt_with_tabs = false # false/true - -# Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true - -# The number of spaces to indent multi-line XML strings. -# Requires indent_align_string=True -indent_xml_string = 4 # number - -# Spaces to indent '{' from level -indent_brace = 0 # number - -# Whether braces are indented to the body level -indent_braces = false # false/true - -# Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true - -# Disabled indenting class braces if indent_braces is true -indent_braces_no_class = false # false/true - -# Disabled indenting struct braces if indent_braces is true -indent_braces_no_struct = false # false/true - -# Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true - -# Whether the 'namespace' body is indented -indent_namespace = true # false/true - -# The number of spaces to indent a namespace block -indent_namespace_level = 0 # number - -# If the body of the namespace is longer than this number, it won't be indented. -# Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number - -# Whether the 'extern "C"' body is indented -indent_extern = false # false/true - -# Whether the 'class' body is indented -indent_class = true # false/true - -# Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true -# Whether to indent the stuff after a leading class initializer colon -indent_constr_colon = false # false/true - -# Virtual indent from the ':' for member initializers. Default is 2 -indent_ctor_init_leading = 2 # number - -# Additional indenting for constructor initializer list -indent_ctor_init = 0 # number - -# False=treat 'else\nif' as 'else if' for indenting purposes -# True=indent the 'if' one level -indent_else_if = false # false/true - -# Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number - -# Indent continued variable declarations instead of aligning. -indent_var_def_cont = true # false/true - -# True: force indentation of function definition to start in column 1 -# False: use the default behavior -indent_func_def_force_col1 = false # false/true - -# True: indent continued function call parameters one indent level -# False: align parameters under the open paren -indent_func_call_param = true # false/true - -# Same as indent_func_call_param, but for function defs -indent_func_def_param = true # false/true - -# Same as indent_func_call_param, but for function protos -indent_func_proto_param = true # false/true - -# Same as indent_func_call_param, but for class declarations -indent_func_class_param = true # false/true - -# Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = true # false/true - -# Same as indent_func_call_param, but for templates -indent_template_param = true # false/true - -# Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true - -# Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number - -# Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number - -# The number of spaces to indent a continued '->' or '.' -# Usually set to 0, 1, or indent_columns. -indent_member = 1 # number - -# Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number - -# If set, will indent trailing single line ('//') comments relative -# to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true - -# Spaces to indent 'case' from 'switch' -# Usually 0 or indent_columns. -indent_switch_case = indent_columns # number - -indent_switch_break_with_case = true - -# Spaces to shift the 'case' line, without affecting any other lines -# Usually 0. -indent_case_shift = 0 # number - -# Spaces to indent '{' from 'case'. -# By default, the brace will appear under the 'c' in case. -# Usually set to 0 or indent_columns. -indent_case_brace = 0 # number - -# Whether to indent comments found in first column -indent_col1_comment = false # false/true - -# How to indent goto labels -# >0 : absolute column where 1 is the leftmost column -# <=0 : subtract from brace indent -indent_label = 1 # number - -# Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number - -# Indent the code after an access specifier by one level. -# If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true - -# If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true - -# Controls the indent of a close paren after a newline. -# 0: Indent to body level -# 1: Align under the open paren -# 2: Indent to the brace level -indent_paren_close = 2 # number - -# Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true - -# Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true - -# If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones -indent_first_bool_expr = false # false/true - -# If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true - -# Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true - -# Align continued statements at the '='. Default=True -# If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = false # false/true - -# Indent OC blocks at brace level instead of usual rules. -indent_oc_block = false # false/true - -# Indent OC blocks in a message relative to the parameter name. -# 0=use indent_oc_block rules, 1+=spaces to indent -indent_oc_block_msg = 0 # number - -# Minimum indent for subsequent parameters -indent_oc_msg_colon = 0 # number - -# Objective C - -# If true, prioritize aligning with initial colon (and stripping spaces from lines, if necessary). -# Default is true. -indent_oc_msg_prioritize_first_colon = true - -# If indent_oc_block_msg and this option are on, blocks will be indented the way that Xcode does by default (from keyword if the parameter is on its own line; otherwise, from the previous indentation level). -indent_oc_block_msg_xcode_style = true - -# If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg keyword. -indent_oc_block_msg_from_keyword = true - -# If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg colon. -indent_oc_block_msg_from_colon = true - -# If indent_oc_block_msg and this option are on, blocks will be indented from where the block caret is. -indent_oc_block_msg_from_caret = true - -# If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is. -indent_oc_block_msg_from_brace = true - -# -# Spacing options -# - -# Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force - -# Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force - -# Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign -sp_cpp_lambda_assign = force # ignore/add/remove/force - -# Add or remove space after the capture specification in C++11 lambda. -sp_cpp_lambda_paren = force # ignore/add/remove/force - -# Add or remove space around assignment operator '=' in a prototype -sp_assign_default = force # ignore/add/remove/force - -# Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = force # ignore/add/remove/force - -# Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = force # ignore/add/remove/force - -# Add or remove space around assignment '=' in enum -sp_enum_assign = force # ignore/add/remove/force - -# Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force - -# Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = force # ignore/add/remove/force - -# Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = add # ignore/add/remove/force - -# Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. -sp_pp_stringify = ignore # ignore/add/remove/force - -# Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'. -sp_before_pp_stringify = ignore # ignore/add/remove/force - -# Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force - -# Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force - -# Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force - -# Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force - -# Add or remove space between back-to-back parens: ')(' vs ') (' -sp_cparen_oparen = force # ignore/add/remove/force -# Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true - -# Add or remove space between ')' and '{' -sp_paren_brace = force # ignore/add/remove/force - -# Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force - -# Add or remove space before pointer star '*' that isn't followed by a variable name -# If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = force # ignore/add/remove/force - -# Add or remove space between pointer stars '*' -sp_between_ptr_star = force # ignore/add/remove/force - -# Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = force # ignore/add/remove/force - -# Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = force # ignore/add/remove/force - -# Add or remove space after a pointer star '*', if followed by an open paren (function types). -sp_ptr_star_paren = force # ignore/add/remove/force - -# Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = force # ignore/add/remove/force - -# Add or remove space before a reference sign '&' -sp_before_byref = force # ignore/add/remove/force - -# Add or remove space before a reference sign '&' that isn't followed by a variable name -# If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force - -# Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = ignore # ignore/add/remove/force - -# Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = remove # ignore/add/remove/force - -# Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = force # ignore/add/remove/force - -# Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force - -# Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('. -sp_before_template_paren = ignore # ignore/add/remove/force - -# Add or remove space in 'template <' vs 'template<'. -# If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force - -# Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force - -# Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force - -# Add or remove space after '<>' -sp_after_angle = remove # ignore/add/remove/force - -# Add or remove space between '<>' and '(' as found in 'new List<byte>();' -sp_angle_paren = remove # ignore/add/remove/force - -# Add or remove space between '<>' and a word as in 'List<byte> m;' -sp_angle_word = force # ignore/add/remove/force - -# Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add -sp_angle_shift = add # ignore/add/remove/force - -# Permit removal of the space between '>>' in 'foo<bar<int> >' (C++11 only). Default=False -# sp_angle_shift cannot remove the space without this option. -sp_permit_cpp11_shift = false # false/true - -# Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force - -# Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force - -# Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force - -# Add or remove space before if-condition '('. Overrides sp_inside_sparen. -sp_inside_sparen_open = ignore # ignore/add/remove/force - -# Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = remove # ignore/add/remove/force - -# Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = force # ignore/add/remove/force - -# Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force - -# Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force - -# Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = remove # ignore/add/remove/force - -# Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force - -# Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = remove # ignore/add/remove/force - -# Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = force # ignore/add/remove/force - -# Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = add # ignore/add/remove/force - -# Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force - -# Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; <here> ). -sp_after_semi_for_empty = force # ignore/add/remove/force - -# Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force - -# Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force - -# Add or remove space inside a non-empty '[' and ']' -sp_inside_square = remove # ignore/add/remove/force - -# Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force - -# Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force - -# Add or remove space between an open paren and comma: '(,' vs '( ,' -sp_paren_comma = force # ignore/add/remove/force - -# Add or remove space before the variadic '...' when preceded by a non-punctuator -sp_before_ellipsis = remove # ignore/add/remove/force - -# Add or remove space after class ':' -sp_after_class_colon = force # ignore/add/remove/force - -# Add or remove space before class ':' -sp_before_class_colon = force # ignore/add/remove/force - -# Add or remove space after class constructor ':' -sp_after_constr_colon = ignore # ignore/add/remove/force - -# Add or remove space before class constructor ':' -sp_before_constr_colon = ignore # ignore/add/remove/force - -# Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force - -# Add or remove space between 'operator' and operator sign -sp_after_operator = force # ignore/add/remove/force - -# Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force - -# Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = force # ignore/add/remove/force - -# Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force - -# Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force - -# Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = force # ignore/add/remove/force - -# Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force - -# Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force - -# Add or remove space inside struct/union '{' force '}' -sp_inside_braces_struct = force # ignore/add/remove/force - -# Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force - -# Add or remove space inside '{}' -sp_inside_braces_empty = remove # ignore/add/remove/force - -# Add or remove space between return type and function name -# A minimum of 1 is forced except for pointer return types. -sp_type_func = remove # ignore/add/remove/force - -# Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force - -# CARL duplicates ERROR ?? -# Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force - -# Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force - -# Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force - -# Add or remove space inside the first parens in the function type: 'void (*x)(...)' -sp_inside_tparen = remove # ignore/add/remove/force - -# Add or remove between the parens in the function type: 'void (*x)(...)' -sp_after_tparen_close = remove # ignore/add/remove/force - -# Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = force # ignore/add/remove/force - -# Add or remove space between ')' and '{' of function -sp_fparen_brace = force # ignore/add/remove/force - -# Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force - -# Add or remove space between function name and '()' on function calls without parameters. -# If set to 'ignore' (the default), sp_func_call_paren is used. -sp_func_call_paren_empty = remove # ignore/add/remove/force - -# Add or remove space between the user function name and '(' on function calls -# You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force -set func_call_user _ - -# Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force - -# Add or remove space between 'return' and '(' -sp_return_paren = force # ignore/add/remove/force - -# Add or remove space between '__attribute__' and '(' -sp_attribute_paren = force # ignore/add/remove/force - -# Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = force # ignore/add/remove/force - -# Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = force # ignore/add/remove/force - -# Add or remove space between 'throw' and anything other than '(' as in '@throw [...];' -sp_after_throw = force # ignore/add/remove/force - -# Add or remove space between 'catch' and '(' in 'catch (something) { }' -# If set to ignore, sp_before_sparen is used. -sp_catch_paren = force # ignore/add/remove/force - -# D -# Add or remove space between 'version' and '(' in 'version (something) { }' (D language) -# If set to ignore, sp_before_sparen is used. -sp_version_paren = ignore # ignore/add/remove/force - -# D -# Add or remove space between 'scope' and '(' in 'scope (something) { }' (D language) -# If set to ignore, sp_before_sparen is used. -sp_scope_paren = ignore # ignore/add/remove/force - -# Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force - -# MACRO -# Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force - -# Add or remove space between 'else' and '{' if on the same line -sp_else_brace = force # ignore/add/remove/force - -# Add or remove space between '}' and 'else' if on the same line -sp_brace_else = force # ignore/add/remove/force - -# Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = force # ignore/add/remove/force - -# Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = force # ignore/add/remove/force - -# Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = force # ignore/add/remove/force - -# Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = force # ignore/add/remove/force - -# Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = force # ignore/add/remove/force - -# Add or remove space between 'try' and '{' if on the same line -sp_try_brace = force # ignore/add/remove/force - -# Add or remove space between get/set and '{' if on the same line -sp_getset_brace = force # ignore/add/remove/force - -# CARL TODO - -# Add or remove space between a variable and '{' for C++ uniform initialization -sp_word_brace = ignore - -# Add or remove space between a variable and '{' for a namespace -sp_word_brace_ns = force - -# C++ -# Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force - -# C++ -# Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force - -# Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force - -# Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force - -# Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force - -# Add or remove space after the '&' (address-of) operator. Default=Remove -# This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force - -# Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force - -# Add or remove space after the '*' (dereference) operator. Default=Remove -# This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force - -# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force - -# Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force - -# Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = add # ignore/add/remove/force - -# Obj c -# Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force - -# Obj c -# Add or remove space after the colon in message specs -# '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force - -# Obj c -# Add or remove space before the colon in message specs -# '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force - -# Obj c -# Add or remove space after the colon in immutable dictionary expression -# 'NSDictionary *test = @{@"foo" :@"bar"};' -sp_after_oc_dict_colon = ignore # ignore/add/remove/force - -# Obj c -# Add or remove space before the colon in immutable dictionary expression -# 'NSDictionary *test = @{@"foo" :@"bar"};' -sp_before_oc_dict_colon = ignore # ignore/add/remove/force - -# Obj c -# Add or remove space after the colon in message specs -# '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force - -# Obj c -# Add or remove space before the colon in message specs -# '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force - -# Obj c -# Add or remove space after the (type) in message specs -# '-(int)f: (int) x;' vs '-(int)f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force - -# Obj c -# Add or remove space after the first (type) in message specs -# '-(int) f:(int)x;' vs '-(int)f:(int)x;' -sp_after_oc_return_type = ignore # ignore/add/remove/force - -# Obj c -# Add or remove space between '@selector' and '(' -# '@selector(msgName)' vs '@selector (msgName)' -# Also applies to @protocol() constructs -sp_after_oc_at_sel = ignore # ignore/add/remove/force - -# Obj c -# Add or remove space between '@selector(x)' and the following word -# '@selector(foo) a:' vs '@selector(foo)a:' -sp_after_oc_at_sel_parens = ignore # ignore/add/remove/force - -# Obj c -# Add or remove space inside '@selector' parens -# '@selector(foo)' vs '@selector( foo )' -# Also applies to @protocol() constructs -sp_inside_oc_at_sel_parens = ignore # ignore/add/remove/force - -# Obj c -# Add or remove space before a block pointer caret -# '^int (int arg){...}' vs. ' ^int (int arg){...}' -sp_before_oc_block_caret = ignore # ignore/add/remove/force - -# Obj c -# Add or remove space after a block pointer caret -# '^int (int arg){...}' vs. '^ int (int arg){...}' -sp_after_oc_block_caret = ignore # ignore/add/remove/force - -# Obj c -# Add or remove space between the receiver and selector in a message. -# '[receiver selector ...]' -sp_after_oc_msg_receiver = ignore # ignore/add/remove/force - -# Obj c -# Add or remove space after @property. -sp_after_oc_property = ignore # ignore/add/remove/force - -# Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = force # ignore/add/remove/force -# TODO - -# Add or remove space before the ':' in 'b ? t : f'. Overrides sp_cond_colon. -sp_cond_colon_before = force -# Add or remove space after the ':' in 'b ? t : f'. Overrides sp_cond_colon. -sp_cond_colon_after = force -# Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = ignore - -# Add or remove space before the '?' in 'b ? t : f'. Overrides sp_cond_question. -sp_cond_question_before = ignore - -sp_type_question = force - -# Add or remove space after the '?' in 'b ? t : f'. Overrides sp_cond_question. -sp_cond_question_after = force - -# In the abbreviated ternary form (a ?: b), add/remove space between ? and :.'. Overrides all other sp_cond_* options. -sp_cond_ternary_short = force - -# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = force # ignore/add/remove/force - -# Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force - -# Control the spacing after ':' in 'for (TYPE VAR : EXPR)' (Java) -sp_after_for_colon = ignore # ignore/add/remove/force - -# Control the spacing before ':' in 'for (TYPE VAR : EXPR)' (Java) -sp_before_for_colon = ignore # ignore/add/remove/force - -# Control the spacing in 'extern (C)' (D) -sp_extern_paren = ignore # ignore/add/remove/force - -# Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = force # ignore/add/remove/force - -# Controls the spaces between #else or #endif and a trailing comment -sp_endif_cmt = remove # ignore/add/remove/force - -# Controls the spaces after 'new', 'delete', and 'delete[]' -sp_after_new = force # ignore/add/remove/force - -# Controls the spaces before a trailing or embedded comment -sp_before_tr_emb_cmt = force # ignore/add/remove/force - -# Number of spaces before a trailing or embedded comment -sp_num_before_tr_emb_cmt = 0 # number - -# Control space between a Java annotation and the open paren. -sp_annotation_paren = ignore # ignore/add/remove/force - -# -# Code alignment (not left column spaces/tabs) -# - -# Whether to keep non-indenting tabs -align_keep_tabs = false # false/true - -# Whether to use tabs for aligning -align_with_tabs = false # false/true - -# Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true - -# Whether to left-align numbers -# align_number_left = false # false/true - -# TODO DOC -# Whether to keep whitespace not required for alignment. -align_keep_extra_space = true - -# Align variable definitions in prototypes and functions -align_func_params = false # false/true - -# Align parameters in single-line functions that have the same name. -# The function names must already be aligned with each other. -align_same_func_call_params = false # false/true - -# The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number - -# How to align the star in variable definitions. -# 0=Part of the type 'void * foo;' -# 1=Part of the variable 'void *foo;' -# 2=Dangling 'void *foo;' -align_var_def_star_style = 0 # number - -# How to align the '&' in variable definitions. -# 0=Part of the type -# 1=Part of the variable -# 2=Dangling -align_var_def_amp_style = 0 # number - -# The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number - -# The gap for aligning variable definitions -align_var_def_gap = 0 # number - -# Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true - -# Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true - -# Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true - -# The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number - -# The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number - -# The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number - -# The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number - -# The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number - -# The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number - -# The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number - -# The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number - -# The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number - -# The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number - -# How to align typedef'd functions with other typedefs -# 0: Don't mix them at all -# 1: align the open paren with the types -# 2: align the function type name with the other type names -align_typedef_func = 0 # number - -# Controls the positioning of the '*' in typedefs. Just try it. -# 0: Align on typedef type, ignore '*' -# 1: The '*' is part of type name: typedef int *pint; -# 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number - -# Controls the positioning of the '&' in typedefs. Just try it. -# 0: Align on typedef type, ignore '&' -# 1: The '&' is part of type name: typedef int &pint; -# 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number - -# The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number - -# If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true - -# If a trailing comment is more than this number of columns away from the text it follows, -# it will qualify for being aligned. This has to be > 0 to do anything. -align_right_cmt_gap = 0 # number - -# Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number - -# The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number - -# Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number - -# Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true - -# Whether to mix aligning prototype and variable declarations. -# If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true - -# Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true - -# Aligning the open brace of single-line functions. -# Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true - -# Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number - -# The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number - -# Whether to align macros wrapped with a backslash and a newline. -# This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true - -# # Align macro functions and variables together -align_pp_define_together = false # false/true - -# The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number - -# The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number - -# Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true - -# Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) -align_oc_msg_colon_span = 0 # number - -# If true, always align with the first parameter, even if it is too short. -align_oc_msg_colon_first = false # false/true - -# Aligning parameters in an Obj-C '+' or '-' declaration on the ':' -align_oc_decl_colon = false # false/true - -# -# Newline adding and removing options -# - -# Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = true # false/true - -# Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true - -# Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = false # false/true - -# Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true - -# Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true - -# Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true - -# Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true - -# Don't split one-line OC messages -nl_oc_msg_leave_one_liner = false # false/true - -# Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force - -# The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number - -# Add or remove newline at the end of the file -nl_end_of_file = ignore # ignore/add/remove/force - -# The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 0 # number - -# Add or remove newline between '=' and '{' -nl_assign_brace = ignore # ignore/add/remove/force - -# Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force - -# Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force - -# The number of blank lines after a block of variable definitions at the top of a function body -# 0 = No change (default) -nl_func_var_def_blk = 0 # number - -# The number of newlines before a block of typedefs -# 0 = No change (default) -nl_typedef_blk_start = 0 # number - -# The number of newlines after a block of typedefs -# 0 = No change (default) -nl_typedef_blk_end = 0 # number - -# The maximum consecutive newlines within a block of typedefs -# 0 = No change (default) -nl_typedef_blk_in = 0 # number - -# The number of newlines before a block of variable definitions not at the top of a function body -# 0 = No change (default) -nl_var_def_blk_start = 0 # number - -# The number of newlines after a block of variable definitions not at the top of a function body -# 0 = No change (default) -nl_var_def_blk_end = 0 # number - -# The maximum consecutive newlines within a block of variable definitions -# 0 = No change (default) -nl_var_def_blk_in = 0 # number - -# Add or remove newline between a function call's ')' and '{', as in: -# list_for_each(item, &list) { } -nl_fcall_brace = ignore # ignore/add/remove/force - -# Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force - -# Add or remove newline between 'struct and '{' -nl_struct_brace = remove # ignore/add/remove/force - -# Add or remove newline between 'union' and '{' -nl_union_brace = remove # ignore/add/remove/force - -# Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force - -# Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force - -# Add or remove newline between 'else if' and '{' -# If set to ignore, nl_if_brace is used instead -nl_elseif_brace = remove # ignore/add/remove/force - -# Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force - -# Add or remove newline between 'else' and 'if' -nl_else_if = remove # ignore/add/remove/force - -# Add or remove newline between '}' and 'finally' -nl_brace_finally = remove # ignore/add/remove/force - -# Add or remove newline between 'finally' and '{' -nl_finally_brace = remove # ignore/add/remove/force - -# Add or remove newline between 'try' and '{' -nl_try_brace = remove # ignore/add/remove/force - -# Add or remove newline between get/set and '{' -nl_getset_brace = remove # ignore/add/remove/force - -# Add or remove newline between 'for' and '{' -nl_for_brace = remove # ignore/add/remove/force - -# Add or remove newline between 'catch' and '{' -nl_catch_brace = remove # ignore/add/remove/force - -# Add or remove newline between '}' and 'catch' -nl_brace_catch = remove # ignore/add/remove/force - -# Add or remove newline between '}' and ']' -nl_brace_square = remove # ignore/add/remove/force - -# Add or remove newline between '}' and ')' in a function invocation -nl_brace_fparen = remove # ignore/add/remove/force -# Add or remove newline between 'while' and '{' -nl_while_brace = remove # ignore/add/remove/force - -# Add or remove newline between 'scope (x)' and '{' (D) -nl_scope_brace = ignore # ignore/add/remove/force - -# Add or remove newline between 'unittest' and '{' (D) -nl_unittest_brace = ignore # ignore/add/remove/force - -# Add or remove newline between 'version (x)' and '{' (D) -nl_version_brace = ignore # ignore/add/remove/force - -# Add or remove newline between 'using' and '{' -nl_using_brace = remove # ignore/add/remove/force - -# Add or remove newline between two open or close braces. -# Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force - -# Add or remove newline between 'do' and '{' -nl_do_brace = remove # ignore/add/remove/force - -# Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force - -# Add or remove newline between 'switch' and '{' -nl_switch_brace = remove # ignore/add/remove/force - -# Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. -# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true - -# Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true - -# Whether to put a newline before 'case' statement -nl_before_case = false # false/true - -# Add or remove newline between ')' and 'throw' -nl_before_throw = remove # ignore/add/remove/force - -# Whether to put a newline after 'case' statement -nl_after_case = false # false/true - -# Add or remove a newline between a case ':' and '{'. Overrides nl_after_case. -nl_case_colon_brace = ignore # ignore/add/remove/force - -# Newline between namespace and { -nl_namespace_brace = remove # ignore/add/remove/force - -# Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force - -# Add or remove newline between 'class' and '{' -nl_class_brace = remove # ignore/add/remove/force - -# Add or remove newline after each ',' in the class base list -nl_class_init_args = remove # ignore/add/remove/force -# Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = remove # ignore/add/remove/force - -# Add or remove newline between return type and function name in a function definition -nl_func_type_name = remove # ignore/add/remove/force - -# Add or remove newline between return type and function name inside a class {} -# Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = remove # ignore/add/remove/force - -# Add or remove newline between function scope and name in a definition -# Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force - -# Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = remove # ignore/add/remove/force - -# Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force - -# Add or remove newline between a function name and the opening '(' in the definition -nl_func_def_paren = remove # ignore/add/remove/force - -# Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force - -# Add or remove newline after '(' in a function definition -nl_func_def_start = remove # ignore/add/remove/force - -# Overrides nl_func_decl_start when there is only one parameter. -nl_func_decl_start_single = ignore # ignore/add/remove/force - -# Overrides nl_func_def_start when there is only one parameter. -nl_func_def_start_single = ignore # ignore/add/remove/force - -# Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force - -# Add or remove newline after each ',' in a function definition -nl_func_def_args = ignore # ignore/add/remove/force - -# Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force - -# Add or remove newline before the ')' in a function definition -nl_func_def_end = remove # ignore/add/remove/force - -# Overrides nl_func_decl_end when there is only one parameter. -nl_func_decl_end_single = ignore # ignore/add/remove/force - -# Overrides nl_func_def_end when there is only one parameter. -nl_func_def_end_single = ignore # ignore/add/remove/force - -# Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = remove # ignore/add/remove/force - -# Add or remove newline between '()' in a function definition. -nl_func_def_empty = remove # ignore/add/remove/force - -# Whether to put each OC message parameter on a separate line -# See nl_oc_msg_leave_one_liner -nl_oc_msg_args = false # false/true - -# Add or remove newline between function signature and '{' -nl_fdef_brace = remove # ignore/add/remove/force - -# Add or remove newline between C++11 lambda signature and '{' -nl_cpp_ldef_brace = ignore # ignore/add/remove/force - -# Add or remove a newline between the return keyword and return expression. -nl_return_expr = remove # ignore/add/remove/force - -# Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = false # false/true - -# CARL ?? -# Whether to put a newline after brace open. -# This also adds a newline before the matching brace close. -nl_after_brace_open = false # false/true - -# If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is -# placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true - -# Whether to put a newline after a virtual brace open with a non-empty body. -# These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true - -# Whether to put a newline after a virtual brace open with an empty body. -# These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open_empty = false # false/true - -# Whether to put a newline after a brace close. -# Does not apply if followed by a necessary ';'. -nl_after_brace_close = false # false/true - -# Whether to put a newline after a virtual brace close. -# Would add a newline before return in: 'if (foo) a++; return;' -nl_after_vbrace_close = false # false/true - -# Control the newline between the close brace and 'b' in: 'struct { int a; } b;' -# Affects enums, unions, and structures. If set to ignore, uses nl_after_brace_close -nl_brace_struct_var = ignore # ignore/add/remove/force - -# Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true - -# Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true - -# Add or remove blank line before 'if' -nl_before_if = ignore # ignore/add/remove/force - -# Add or remove blank line after 'if' statement -nl_after_if = ignore # ignore/add/remove/force - -# Add or remove blank line before 'for' -nl_before_for = ignore # ignore/add/remove/force - -# Add or remove blank line after 'for' statement -nl_after_for = ignore # ignore/add/remove/force - -# Add or remove blank line before 'while' -nl_before_while = ignore # ignore/add/remove/force - -# Add or remove blank line after 'while' statement -nl_after_while = ignore # ignore/add/remove/force - -# Add or remove blank line before 'switch' -nl_before_switch = ignore # ignore/add/remove/force - -# Add or remove blank line after 'switch' statement -nl_after_switch = ignore # ignore/add/remove/force - -# Add or remove blank line before 'do' -nl_before_do = ignore # ignore/add/remove/force - -# Add or remove blank line after 'do/while' statement -nl_after_do = ignore # ignore/add/remove/force - -# Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true - -# Whether to double-space before the close brace of a struct/union/enum -# (lower priority than 'eat_blanks_before_close_brace') -nl_ds_struct_enum_close_brace = false # false/true - -# Add or remove a newline around a class colon. -# Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force - -# Add or remove a newline around a class constructor colon. -# Related to pos_constr_colon, nl_constr_init_args, and pos_constr_comma. -nl_constr_colon = ignore # ignore/add/remove/force - - -# Change simple unbraced if statements into a one-liner -# 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true - -# Change simple unbraced for statements into a one-liner -# 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true - -# Change simple unbraced while statements into a one-liner -# 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true - -# -# Positioning options -# - -# The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force - -# The position of assignment in wrapped expressions. -# Do not affect '=' followed by '{' -pos_assign = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force - -# The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force - -# The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force - -# The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force - -# The position of the comma in wrapped expressions -pos_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force - -# The position of the comma in the class base list -pos_class_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force - -# The position of the comma in the constructor initialization list -pos_constr_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force - -# The position of colons between class and base class list -pos_class_colon = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force - -# The position of colons between constructor and member initialization -pos_constr_colon = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force - -# -# Line Splitting options -# - -# Try to limit code width to N number of columns -code_width = 0 # number - -# Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true - -# Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true - -# Whether to split lines as close to code_width as possible and ignore some groupings -ls_code_width = false # false/true - -# -# Blank line options -# - -# The maximum consecutive newlines -nl_max = 0 # number - -# The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number - -# The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number - -# The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number - -# The number of newlines after '}' of a multi-line function body in a class declaration -nl_after_func_body_class = 2 # number - -# The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number - -# The minimum number of newlines before a multi-line comment. -# Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number - -# The minimum number of newlines before a single-line C comment. -# Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number - -# The minimum number of newlines before a CPP comment. -# Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number - -# Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = false # false/true - -# The number of newlines after '}' or ';' of a struct/enum/union definition -nl_after_struct = 0 # number - -# The number of newlines after '}' or ';' of a class definition -nl_after_class = 0 # number - -# The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. -# Will not change the newline count if after a brace open. -# 0 = No change. -nl_before_access_spec = 0 # number - -# The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. -# 0 = No change. -nl_after_access_spec = 0 # number - -# The number of newlines between a function def and the function comment. -# 0 = No change. -nl_comment_func_def = 0 # number - -# The number of newlines after a try-catch-finally block that isn't followed by a brace close. -# 0 = No change. -nl_after_try_catch_finally = 0 # number - -# The number of newlines before and after a property, indexer or event decl. -# 0 = No change. -nl_around_cs_property = 0 # number - -# The number of newlines between the get/set/add/remove handlers in C#. -# 0 = No change. -nl_between_get_set = 0 # number - -# Add or remove newline between C# property and the '{' -nl_property_brace = ignore # ignore/add/remove/force - -# Whether to remove blank lines after '{' -eat_blanks_after_open_brace = false # false/true - -# Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true - -# How aggressively to remove extra newlines not in preproc. -# 0: No change -# 1: Remove most newlines not handled by other config -# 2: Remove all newlines and reformat completely by config -nl_remove_extra_newlines = 0 # number - -# Whether to put a blank line before 'return' statements, unless after an open brace. -nl_before_return = false # false/true - -# Whether to put a blank line after 'return' statements, unless followed by a close brace. -nl_after_return = false # false/true - -# Whether to put a newline after a Java annotation statement. -# Only affects annotations that are after a newline. -nl_after_annotation = ignore # ignore/add/remove/force - -# Controls the newline between two annotations. -nl_between_annotation = ignore # ignore/add/remove/force - -# -# Code modifying options (non-whitespace) -# - -# Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force - -# Add or remove braces on single-line 'for' statement -mod_full_brace_for = ignore # ignore/add/remove/force - -# Add or remove braces on single-line function definitions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force - -# Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = ignore # ignore/add/remove/force - -# Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. -# If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = false # false/true - -# Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number - -# Add or remove braces on single-line 'while' statement -mod_full_brace_while = ignore # ignore/add/remove/force - -# Add or remove braces on single-line 'using ()' statement -mod_full_brace_using = ignore # ignore/add/remove/force - -# Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = ignore # ignore/add/remove/force - -# Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true - -# Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true - -# Whether to remove superfluous semicolons -mod_remove_extra_semicolon = false # false/true - -# If a function body exceeds the specified number of newlines and doesn't have a comment after -# the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number - -# If a namespace body exceeds the specified number of newlines and doesn't have a comment after -# the close brace, a comment will be added. -mod_add_long_namespace_closebrace_comment = 0 # number -# If a switch body exceeds the specified number of newlines and doesn't have a comment after -# the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number - -# If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after -# the #endif, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number - -# If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after -# the #else, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number - -# If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true - -# If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true - -# If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] -# This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true - -# If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true - -# Will add or remove the braces around a fully braced case statement. -# Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = ignore # ignore/add/remove/force - -# If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = false # false/true - -# -# Comment modifications -# - -# Try to wrap comments at cmt_width columns -cmt_width = 0 # number - -# Set the comment reflow mode (default: 0) -# 0: no reflowing (apart from the line wrapping due to cmt_width) -# 1: no touching at all -# 2: full reflow -cmt_reflow_mode = 0 # number - -# If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. -# Default is true. -cmt_indent_multi = true # false/true - -# Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true - -# Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true - -# Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true - -# Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true - -# Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true - -# Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true - -# Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true - -# Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true - -# The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number - -# The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number - -# For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of -# the comment are the same length. Default=True -cmt_multi_check_last = true # false/true - -# The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. -# Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string - -# The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. -# Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string - -# The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. -# Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. -# Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string - -# The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. -# Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string - -# The filename that contains text to insert before a Obj-C message specification if the method isn't preceeded with a C/C++ comment. -# Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff. -cmt_insert_oc_msg_header = "" # string - -# If a preprocessor is encountered when stepping backwards from a function name, then -# this option decides whether the comment should be inserted. -# Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true - -# -# Preprocessor options -# - -# Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = ignore # ignore/add/remove/force - -# Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true - -# If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number - -# Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force - -# Sets the number of spaces added with pp_space -pp_space_count = 0 # number - -# The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number - -# Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true - -# If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number - -# Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true - -# Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true - - |
