Merge branch 'feature/upstream' into develop

1 files changed, 63 insertions, 0 deletions

diff --git a/help/C/figures/trash_process.svg b/help/C/figures/trash_process.svg
new file mode 100644
index 0000000..ca10913
--- /dev/null
+++ b/help/C/figures/trash_process.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="193.78221mm" height="41.881069mm" viewBox="0 0 686.62989 148.39748" id="svg2" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="trash_process.svg">
+  <defs id="defs4">
+    <marker inkscape:stockid="TriangleOutL" orient="auto" refY="0" refX="0" id="marker4802" style="overflow:visible" inkscape:isstock="true">
+      <path id="path4804" d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="scale(0.8,0.8)" inkscape:connector-curvature="0"/>
+    </marker>
+    <marker inkscape:isstock="true" style="overflow:visible" id="marker8368" refX="0" refY="0" orient="auto" inkscape:stockid="TriangleOutL" inkscape:collect="always">
+      <path transform="scale(0.8,0.8)" style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" id="path8370" inkscape:connector-curvature="0"/>
+    </marker>
+    <marker inkscape:isstock="true" style="overflow:visible" id="marker8316" refX="0" refY="0" orient="auto" inkscape:stockid="TriangleOutL">
+      <path transform="scale(0.8,0.8)" style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" id="path8318" inkscape:connector-curvature="0"/>
+    </marker>
+    <marker inkscape:stockid="TriangleOutL" orient="auto" refY="0" refX="0" id="TriangleOutL" style="overflow:visible" inkscape:isstock="true" inkscape:collect="always">
+      <path id="path4320" d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="scale(0.8,0.8)" inkscape:connector-curvature="0"/>
+    </marker>
+    <marker inkscape:stockid="Arrow1Lend" orient="auto" refY="0" refX="0" id="Arrow1Lend" style="overflow:visible" inkscape:isstock="true">
+      <path id="path4181" d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="matrix(-0.8,0,0,-0.8,-10,0)" inkscape:connector-curvature="0"/>
+    </marker>
+    <marker inkscape:stockid="TriangleOutL" orient="auto" refY="0" refX="0" id="TriangleOutL-3" style="overflow:visible" inkscape:isstock="true" inkscape:collect="always">
+      <path inkscape:connector-curvature="0" id="path4320-2" d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="scale(0.8,0.8)"/>
+    </marker>
+    <marker inkscape:stockid="TriangleOutL" orient="auto" refY="0" refX="0" id="TriangleOutL-5" style="overflow:visible" inkscape:isstock="true">
+      <path inkscape:connector-curvature="0" id="path4320-9" d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="scale(0.8,0.8)"/>
+    </marker>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" inkscape:cx="349.16263" inkscape:cy="-79.50903" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" showguides="true" inkscape:guide-bbox="true" inkscape:window-width="1680" inkscape:window-height="1013" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" fit-margin-top="5" fit-margin-left="5" fit-margin-right="5" fit-margin-bottom="5"/>
+  <metadata id="metadata7">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+        <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/"/>
+      </cc:Work>
+      <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
+        <cc:requires rdf:resource="http://creativecommons.org/ns#Notice"/>
+        <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+        <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike"/>
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-37.88799,-14.872865)">
+    <rect style="fill:#73d216;fill-opacity:1;stroke:#204a87;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" id="rect4166" width="135.71428" height="67.85714" x="56.104527" y="49.790771"/>
+    <rect style="fill:#fce94f;fill-opacity:1;stroke:#204a87;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" id="rect4168" width="95" height="67.85714" x="274.42856" y="49.790771"/>
+    <rect style="fill:#fcaf3e;fill-opacity:1;stroke:#204a87;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" id="rect4170" width="95" height="68.571426" x="457.30194" y="49.076492"/>
+    <path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95816344px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#TriangleOutL)" d="m 190.49639,70.50506 78.03657,0" id="path4172" inkscape:connector-curvature="0"/>
+    <path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.97407269px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#TriangleOutL-3)" d="m 369.93812,70.44013 80.64952,0" id="path4172-1" inkscape:connector-curvature="0"/>
+    <path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.84528893px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker8368)" d="m 552.07081,70.56609 60.73364,0" id="path4172-9" inkscape:connector-curvature="0"/>
+    <text xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:100%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="55.973629" y="42.086456" id="text8420" sodipodi:linespacing="100%"><tspan sodipodi:role="line" id="tspan8422" x="55.973629" y="42.086456" style="font-size:12.5px;line-height:100%;text-align:start;writing-mode:lr-tb;text-anchor:start">Shotwell photo library</tspan></text>
+    <text xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:11.25px;line-height:110.00000238%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="213.51428" y="87.442764" id="text8424" sodipodi:linespacing="110%"><tspan sodipodi:role="line" x="213.51428" y="87.442764" id="tspan8428">Delete</tspan><tspan sodipodi:role="line" x="213.51428" y="99.817764" id="tspan8432">photo</tspan></text>
+    <text xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="278.33932" y="44.509552" id="text8436" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan8438" x="278.33932" y="44.509552">Shotwell trash</tspan></text>
+    <text xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="456.81818" y="42.086456" id="text8440" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan8442" x="456.81818" y="42.086456">Computer trash</tspan></text>
+    <text xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:11.25px;line-height:110.00000238%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="389.39902" y="87.096695" id="text4768" sodipodi:linespacing="110%"><tspan sodipodi:role="line" id="tspan4770" x="389.39902" y="87.096695">Empty</tspan><tspan sodipodi:role="line" x="389.39902" y="99.471695" id="tspan4772">Shotwell</tspan><tspan sodipodi:role="line" x="389.39902" y="111.84669" id="tspan4774">trash</tspan></text>
+    <text xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:11.25px;line-height:110.00000238%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="571.19165" y="87.096695" id="text4776" sodipodi:linespacing="110%"><tspan sodipodi:role="line" id="tspan4778" x="571.19165" y="87.096695">Empty</tspan><tspan sodipodi:role="line" x="571.19165" y="99.471695" id="tspan4780">Computer</tspan><tspan sodipodi:role="line" x="571.19165" y="111.84669" id="tspan4782">trash</tspan><tspan sodipodi:role="line" x="571.19165" y="124.22169" id="tspan4784">(deleted from hard disk)</tspan></text>
+    <path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker4802)" d="m 323.5619,118.26221 -0.4619,26.79047 -201.39048,-0.4619 -0.0522,-20.95068" id="path4794" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc"/>
+    <text xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:11.25px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="180.80762" y="139.61136" id="text5268" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan5270" x="180.80762" y="139.61136">Restore photo</tspan></text>
+    <text xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:25px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="641.44867" y="80.285461" id="text5272" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan5274" x="641.44867" y="80.285461">?</tspan></text>
+  </g>
+</svg>
\ No newline at end of file