New upstream version 0.28.2upstream/0.28.2

7 files changed, 21 insertions, 33 deletions

diff --git a/help/C/edit-adjustments.page b/help/C/edit-adjustments.page
index d96b8fe..a388a7b 100644
--- a/help/C/edit-adjustments.page
+++ b/help/C/edit-adjustments.page
@@ -25,6 +25,10 @@
    <p>Changes the brightness to make it look like the photo was exposed for a longer or shorter time. Use this to correct under- or over-exposed photos.</p>
   </item>
   <item>
+   <title>Contrast</title>
+   <p>Changes the contrast of a photo. Use it to correct flat-looking photos or photos where the difference between bright and dark spots seems to big.</p>
+  </item>
+  <item>
    <title>Saturation</title>
    <p>Changes how vivid colors look. If your photo looks gray and washed out, try increasing the saturation. If colors look too bold, try decreasing it.</p>
   </item>
diff --git a/help/C/import-f-spot.page b/help/C/import-f-spot.page
deleted file mode 100644
index f96c128..0000000
--- a/help/C/import-f-spot.page
+++ /dev/null
@@ -1,22 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="import-f-spot">
-
-    <info>
-        <link type="guide" xref="index#import"/>
-        <desc>Shotwell can import all your photos and tags from the F-Spot photo manager.</desc>
-        
-        <link type="next" xref="import-camera"/>
-    </info>
-
-	<title>Importing from F-Spot</title>
-
-    <p>To import an existing photo collection from F-Spot:</p>
-    <steps>
-    <item><p>Select <guiseq><gui>File</gui><gui>Import From F-Spot</gui></guiseq>. </p></item>
-    <item><p>Now choose either the default F-Spot library or another F-Spot database.
-    If importing from another F-Spot database, select a directory and file from the chooser dialog box.</p></item>
-    </steps>
-    <p>Shotwell will import your photos, together with their tags and other information.
-    Once the import is complete, you can select <gui>Last Import</gui> in the sidebar to see all photos successfully imported. The Events list will also show new entries for the dates corresponding to the imported photos.</p>
-</page>
diff --git a/help/C/import-file.page b/help/C/import-file.page
index da25e4e..fcbeb46 100644
--- a/help/C/import-file.page
+++ b/help/C/import-file.page
@@ -6,14 +6,14 @@
         <link type="guide" xref="index#import"/>
         <desc>Import photos that are already saved on your computer.</desc>
         
-        <link type="next" xref="import-f-spot"/>
+        <link type="next" xref="import-camera"/>
     </info>
 
 	<title>Importing from your hard disk</title>
 
     <p>To import photo files from your hard disk into Shotwell, just drag them from your file browser into the Shotwell window.</p>
     
-    <p>Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder...</gui></guiseq> and select the folder containing the photos you want to import.</p>
+    <p>Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder...</gui></guiseq> and select the folder containing the photos you want to import. If you do not want Shotwell to recurse into subfolders while importing, you can uncheck the <gui>Recurse Into Subfolders</gui> checkbox on the bottom of the file dialog.</p>
     
     <p>Shotwell will ask whether you want to copy the photo files to your library folder (usually this is the <file>Pictures</file> folder in your home directory) or to import them in place without copying the files.</p>
     
diff --git a/help/C/other-files.page b/help/C/other-files.page
index 20bb9f8..9a9bd98 100644
--- a/help/C/other-files.page
+++ b/help/C/other-files.page
@@ -70,7 +70,7 @@
         </table>
 
         <p>
-            There are other symbols available; please check the manual for strftime by running 
+            There are other symbols available; please check the <link href="man:strftime">manual for strftime</link> by running
             the command <cmd>man strftime</cmd> if you need one that isn't listed here.
         </p>
     </section>
diff --git a/help/C/share-export.page b/help/C/share-export.page
index 992ca11..693a52a 100644
--- a/help/C/share-export.page
+++ b/help/C/share-export.page
@@ -35,7 +35,14 @@ Shotwell will be included, and Shotwell will convert photos to the destination f
 </list>
 </item>
 <item><p>The image quality for exporting (Low, Medium, High, or Maximum).</p></item>
-<item><p>A scaling constraint (which means how Shotwell will decide to scale the photos down), and the desired pixel size.</p></item>
+<item><p>A scaling constraint (which means how Shotwell will decide to scale the photos down), and the desired pixel size.</p>
+<terms>
+<item><title>Original size</title><p>Image will be exported without any scaling applied</p></item>
+<item><title>Longest edge</title><p>Image will be exported by having its longest edge scaled to <gui>Pixels</gui> and the other according to the aspect ratio</p></item>
+<item><title>Width</title><p>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 Edge</gui> for landscape pictures.</p></item>
+<item><title>Height</title><p>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 Edge</gui> for portrait pictures.</p></item>
+</terms>
+</item>
 <item><p>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 which shouldn't be seen by anyone.</p></item>
 </list>
 
diff --git a/help/C/share-upload.page b/help/C/share-upload.page
index 739e73e..76740a5 100644
--- a/help/C/share-upload.page
+++ b/help/C/share-upload.page
@@ -15,17 +15,17 @@
     and videos to the following services, each of which requires an account:</p>
     
     <list>
-    <item><p><link href="http://facebook.com">Facebook</link></p></item>
-    <item><p><link href="http://flickr.com">Flickr</link></p></item>
-    <item><p><link href="http://picasaweb.google.com">Picasa Web Albums</link> and <link href="http://plus.google.com">Google+</link></p></item>
-    <item><p><link href="http://youtube.com">YouTube</link> (videos only)</p></item>
-    <item><p><link href="http://fotki.yandex.ru">Yandex.Fotki</link>, a photo site popular in Russia (photos only)</p></item>
+    <item><p><link href="https://facebook.com">Facebook</link></p></item>
+    <item><p><link href="https://flickr.com">Flickr</link></p></item>
+    <item><p><link href="https://picasaweb.google.com">Picasa Web Albums</link> and <link href="http://plus.google.com">Google+</link></p></item>
+    <item><p><link href="https://youtube.com">YouTube</link> (videos only)</p></item>
+    <item><p><link href="https://tumblr.com">Tumblr</link> (videos only)</p></item>
     <item><p>Any site running the <link href="http://piwigo.org">Piwigo</link> photo gallery software (photos only)</p></item>
     </list>
     
     <p>To publish selected photos in a collection, choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> and
     click on the <gui>Plugins</gui> tab to enable the plugin for the service you want to publish to.  Next, choose,
-     <guiseq><gui>File</gui><gui>Publish</gui></guiseq>, press the <gui>Publish</gui> toolbar button or use <keyseq><key>Ctrl</key><key>P</key></keyseq>.
+     <guiseq><gui>File</gui><gui>Publish</gui></guiseq>, press the <gui>Publish</gui> toolbar button or use <keyseq><key>Ctrl</key><key>Shift</key><key>P</key></keyseq>.
     You will see a dialog that lets you select a publishing service.  You will then need to log in or create an account.</p>
     
     <p>Publishing to Facebook requires you to grant certain permissions to the Shotwell Facebook application.
diff --git a/help/C/view-sidebar.page b/help/C/view-sidebar.page
index 2da4674..25c5d25 100644
--- a/help/C/view-sidebar.page
+++ b/help/C/view-sidebar.page
@@ -11,7 +11,6 @@
         <link type="seealso" xref="flag"/>
         <link type="seealso" xref="search#savedsearch"/>
         <link type="seealso" xref="import-file"/>
-        <link type="seealso" xref="import-f-spot"/>
         <link type="seealso" xref="import-memorycard"/>
         <link type="seealso" xref="import-camera"/>