Merge tag 'upstream/0.23.1'

Upstream version 0.23.1

15 files changed, 33 insertions, 34 deletions

diff --git a/help/C/edit-adjustments.page b/help/C/edit-adjustments.page
index c8d9e3f..af22497 100644
--- a/help/C/edit-adjustments.page
+++ b/help/C/edit-adjustments.page
@@ -15,7 +15,7 @@
 
 <p>The <gui>Enhance</gui> button adjusts the histogram and shadows sliders to improve the quality of a photo.</p>
 
-<p>When the photo's colors and contrast are to your liking, press <gui>Apply</gui> to save the changes. <gui>Reset</gui> will return the image to its original state. <gui>Cancel</gui> discards all changes you've made.</p>
+<p>When the photo's colors and contrast are to your liking, press <gui>OK</gui> to save the changes. <gui>Reset</gui> will return the image to its original state. <gui>Cancel</gui> discards all changes you've made.</p>
 
 <section>
  <title>What do the color adjustments do?</title>
diff --git a/help/C/edit-crop.page b/help/C/edit-crop.page
index f39028f..0a7375d 100644
--- a/help/C/edit-crop.page
+++ b/help/C/edit-crop.page
@@ -26,7 +26,7 @@
   <p>You can also constrain the crop box to one of many common sizes. Choose a size from the drop-down list that suits your needs. If you press the flip button next to it, the orientation of the constraint will switch (from landscape to portrait).</p>
  </item>
  <item>
-  <p>When you're happy with your crop outline, press the <gui>Apply</gui> button. Shotwell will display the cropped photo.</p>
+  <p>When you're happy with your crop outline, apply it by pressing the <gui>Crop</gui> button. Shotwell will display the cropped photo.</p>
  </item>
  <item>
   <p>If you change your mind, press the <gui>Crop</gui> button again and fine-tune the crop.</p>
diff --git a/help/C/edit-time-date.page b/help/C/edit-date-time.page
index 2f3f03c..846c8a8 100644
--- a/help/C/edit-time-date.page
+++ b/help/C/edit-date-time.page
@@ -1,21 +1,20 @@
 <page xmlns="http://projectmallard.org/1.0/"
       type="guide"
-      id="edit-time-date">
+      id="edit-date-time">
 
     <info>
         <link type="guide" xref="index#edit"/>
-        <desc>Change the time and date of photos if those details are incorrect.</desc>
-        
+        <desc>Change the date and time of photos if those details are incorrect.</desc>
+
         <link type="next" xref="edit-enhance" />
     </info>
 
-	<title>Adjust the time and date of photos</title>
+	<title>Adjust the date and time of photos</title>
 
-<p>To adjust the time and date of photos, select the photos you would like to adjust, choose <guiseq><gui>Photos</gui><gui>Adjust Time and Date</gui></guiseq> and select a new time and date.</p>
+<p>To adjust the date and time of photos, select the photos you would like to adjust, choose <guiseq><gui>Photos</gui><gui>Adjust Date and Time...</gui></guiseq> and select a new date and time.</p>
 
 <p>If you are changing the date and time of multiple photos at once, you can choose to shift all the photos by the same amount of time or to set all the photos to the same time.</p>
 
-<p>By default, the time and date are only changed inside Shotwell. You can also choose to modify the time and date in the original file, but this cannot be undone once you exit Shotwell.</p>
+<p>By default, the date and time are only changed inside Shotwell. You can also choose to modify the date and time in the original file, but this cannot be undone once you exit Shotwell.</p>
 
 </page>
-
diff --git a/help/C/edit-nondestructive.page b/help/C/edit-nondestructive.page
index c289e25..fe65665 100644
--- a/help/C/edit-nondestructive.page
+++ b/help/C/edit-nondestructive.page
@@ -6,7 +6,7 @@
         <link type="guide" xref="index#edit"/>
         <desc>Shotwell is a non-destructive photo editor - it does not modify your original photos.</desc>
         
-        <link type="next" xref="edit-time-date" />
+        <link type="next" xref="edit-date-time" />
     </info>
 
 	<title>What happens to the original when I edit a photo?</title>
diff --git a/help/C/edit-straighten.page b/help/C/edit-straighten.page
index 6dc0af1..2f36257 100644
--- a/help/C/edit-straighten.page
+++ b/help/C/edit-straighten.page
@@ -21,7 +21,7 @@
       <p>Drag the slider to achieve the desired degree of straightening.</p>
      </item>
      <item>
-      <p>Press <gui>OK</gui> when finished.</p>
+      <p>Press <gui>Straighten</gui> when finished.</p>
      </item>
  </steps>
 
diff --git a/help/C/formats.page b/help/C/formats.page
index 5b9b19d..5b9b19d 100755..100644
--- a/help/C/formats.page
+++ b/help/C/formats.page
diff --git a/help/C/import-file.page b/help/C/import-file.page
index afc8cef..da25e4e 100644
--- a/help/C/import-file.page
+++ b/help/C/import-file.page
@@ -13,7 +13,7 @@
 
     <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.</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/import-memorycard.page b/help/C/import-memorycard.page
index 79833d9..2a2b6d1 100644
--- a/help/C/import-memorycard.page
+++ b/help/C/import-memorycard.page
@@ -21,7 +21,7 @@
   <p>The card reader and card should be detected automatically.</p>
  </item>
  <item>
-  <p>Follow the instructions for <link xref="import-file">importing photos from your hard disk</link>. If you click <guiseq><gui>File</gui><gui>Import From Folder</gui></guiseq>, the memory card should be visible as a folder in the side bar of the file selection window.</p>
+  <p>Follow the instructions for <link xref="import-file">importing photos from your hard disk</link>. If you click <guiseq><gui>File</gui><gui>Import From Folder...</gui></guiseq>, the memory card should be visible as a folder in the side bar of the file selection window.</p>
  </item>
 </steps>
 
diff --git a/help/C/organize-event.page b/help/C/organize-event.page
index 72bf212..cecd4a7 100644
--- a/help/C/organize-event.page
+++ b/help/C/organize-event.page
@@ -24,7 +24,7 @@
     <section>
     <title>Renaming events</title>
 
-    <p>To give an event a name rather than referring to it by its date, select the event, click <guiseq><gui>Edit</gui><gui>Rename Event</gui></guiseq> and enter a new name. Another way of renaming an event is to double-click its name in the sidebar; type a new name and then press <key>Enter</key>.</p>
+    <p>To give an event a name rather than referring to it by its date, select the event, click <guiseq><gui>Events</gui><gui>Rename Event...</gui></guiseq> and enter a new name. Another way of renaming an event is to double-click its name in the sidebar; type a new name and then press <key>Enter</key>.</p>
     </section>
 
     <section>
@@ -50,7 +50,7 @@
     <section>
     <title>Change the photo used to represent each event</title>
 
-    <p>If you select the Events item in the sidebar, you'll see a single photo which represents each event. This is called the key photo.</p>
+    <p>If you select the <gui>Events</gui> item in the sidebar, you'll see a single photo which represents each event. This is called the key photo.</p>
 
     <p>By default, Shotwell uses the first photo in each event as its key photo.
     To use a different key photo, select the photo and choose <guiseq><gui>Photos</gui><gui>Make Key Photo for Event</gui></guiseq>.</p>
diff --git a/help/C/organize-search.page b/help/C/organize-search.page
index 7f97370..c6ecec4 100644
--- a/help/C/organize-search.page
+++ b/help/C/organize-search.page
@@ -48,15 +48,15 @@
             </p>
             
             <p>
-                Create a new saved search with <guiseq><gui>Edit</gui><gui>New Search</gui></guiseq> or by hitting 
+                Create a new saved search with <guiseq><gui>Edit</gui><gui>New Saved Search...</gui></guiseq> or by hitting
                 <keyseq><key>Ctrl</key><key>S</key></keyseq>. The dialog box allows you to enter a name for the
                 search and select whether you want to meet Any, All, or None of the criteria in the following rows.
             </p>
             
             <p>
-                Each row represents a search criterion.  Use the + button to add more rows, and the - button to
-                remove a specific row.  The combo box on the left of each row selects the type of criteria.  
-                Criteria must be entered correctly before the OK button becomes available.
+                Each row represents a search criterion.  Use the <gui>+</gui> button to add more rows, and the
+                <gui>-</gui> button to remove a specific row.  The combo box on the left of each row selects the type
+                of criteria. Criteria must be entered correctly before the <gui>OK</gui> button becomes available.
             </p>
     </section>
 
diff --git a/help/C/organize-tag.page b/help/C/organize-tag.page
index 86f2d0c..2c267fa 100644
--- a/help/C/organize-tag.page
+++ b/help/C/organize-tag.page
@@ -25,27 +25,27 @@
 	</p>
     
     <list>
-		<item><p>Choose <guiseq><gui>Tags</gui><gui>Add Tags</gui></guiseq>.</p></item>
+		<item><p>Choose <guiseq><gui>Tags</gui><gui>Add Tags...</gui></guiseq>.</p></item>
 		<item><p>Type <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p></item>
 		<item><p>Drag the selected photos and drop them on the desired tag.</p></item>
     </list>
      
     <p>
 		When you use <keyseq><key>Ctrl</key><key>T</key></keyseq> or 
-		<guiseq><gui>Tags</gui><gui>Add Tags</gui></guiseq> you can type 
+		<guiseq><gui>Tags</gui><gui>Add Tags...</gui></guiseq> you can type
 		in the names of one or more tags, separated by commas.
 		Once you have created a tag, you can rename it by selecting that 
 		tag in the sidebar and choosing 
-		<guiseq><gui>Tags</gui><gui>Rename Tag "[name]"</gui></guiseq>, 
-		by rightclicking on it and choose <gui>Rename...</gui> or 
+		<guiseq><gui>Tags</gui><gui>Rename Tag "[name]"...</gui></guiseq>,
+		by rightclicking on it and choose <gui>Rename...</gui> or
 		double-click on the tag in the sidebar.
 	</p>
     
     <p>
 		To change which tags are associated with a particular photo, 
 		select that photo, choose 
-		<guiseq><gui>Tags</gui><gui>Modify Tags</gui></guiseq> or 
-		right-click on a photo and select <gui>Modify Tags</gui> and 
+		<guiseq><gui>Tags</gui><gui>Modify Tags...</gui></guiseq> or
+		right-click on a photo and select <gui>Modify Tags...</gui> and
 		edit the comma separated list.
 		To remove a tag from one or more photos, first select that tag 
 		in the sidebar, then select the photos you would like to remove, 
@@ -63,9 +63,9 @@
 
     <p>
 		When you create a tag, it will appear in the sidebar under the 
-		Tags item, which is hidden if there are no tags. Photos can have 
-		multiple tags attached to them, and when you click on the name 
-		of a given tag in the sidebar, you will see all the photos 
+		<gui>Tags</gui> item, which is hidden if there are no tags. Photos
+		can have multiple tags attached to them, and when you click on the
+		name of a given tag in the sidebar, you will see all the photos
 		associated with that tag.
 	</p>
     
diff --git a/help/C/organize-title.page b/help/C/organize-title.page
index 1bc1790..dc1aed5 100644
--- a/help/C/organize-title.page
+++ b/help/C/organize-title.page
@@ -15,6 +15,6 @@
 beneath each photo.  By default, a photo's title is its filename.</p>
 
 <p>To change a photo's title,
-select the photo and click <guiseq><gui>Photos</gui><gui>Edit Title</gui></guiseq>, or press <key>F2</key>.</p>
+select the photo and click <guiseq><gui>Photos</gui><gui>Edit Title...</gui></guiseq>, or press <key>F2</key>.</p>
 
 </page>
diff --git a/help/C/share-background.page b/help/C/share-background.page
index 9dff407..86aabf8 100644
--- a/help/C/share-background.page
+++ b/help/C/share-background.page
@@ -14,7 +14,7 @@
     <p>To set a single photo as your desktop background, select the photo and choose <guiseq><gui>File</gui><gui>Set as Desktop Background</gui></guiseq>.</p>
     
     <p>You can also set your background to a slideshow of photos.  To do this, select the photos for
-    the slideshow and choose <guiseq><gui>File</gui><gui>Set as Desktop Slideshow</gui></guiseq>.
+    the slideshow and choose <guiseq><gui>File</gui><gui>Set as Desktop Slideshow...</gui></guiseq>.
     Shotwell will prompt you for a slideshow delay, which can be any interval up to one day in length.
     The background slideshow will proceed even when Shotwell is not running.
     </p>
diff --git a/help/C/share-export.page b/help/C/share-export.page
index 65a5f83..992ca11 100644
--- a/help/C/share-export.page
+++ b/help/C/share-export.page
@@ -16,7 +16,7 @@ a file manager window or your desktop. The new files will be full-sized copies o
 the photos in your library.</p>
 
 <p>
-Alternatively, select a set of photos and choose the <guiseq><gui>File</gui><gui>Export</gui></guiseq> command or press <keyseq><key>Shift</key><key>Ctrl</key><key>E</key></keyseq>, which exports photos while letting you fine-tune the size and dimensions of your photo files.
+Alternatively, select a set of photos and choose the <guiseq><gui>File</gui><gui>Export...</gui></guiseq> command or press <keyseq><key>Shift</key><key>Ctrl</key><key>E</key></keyseq>, which exports photos while letting you fine-tune the size and dimensions of your photo files.
 A window will appear allowing you to make several choices:
 </p>
 
diff --git a/help/C/share-print.page b/help/C/share-print.page
index 7af4799..05bb635 100644
--- a/help/C/share-print.page
+++ b/help/C/share-print.page
@@ -4,18 +4,18 @@
 
     <info>
         <link type="guide" xref="index#share"/>
-        <desc>Click <guiseq><gui>File</gui><gui>Print</gui></guiseq>. For more printing options, select the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog.</desc>
+        <desc>Click <guiseq><gui>File</gui><gui>Print...</gui></guiseq>. For more printing options, select the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog.</desc>
         
         <link type="next" xref="share-upload" />
     </info>
 
 	<title>Printing</title>
 
-    <p>To print a photo, select it and choose <guiseq><gui>File</gui><gui>Print</gui></guiseq>.</p>
+    <p>To print a photo, select it and choose <guiseq><gui>File</gui><gui>Print...</gui></guiseq>.</p>
      
     <p>
     Shotwell can also print multiple images in one page; to do this, select multiple images, 
-    choose <guiseq><gui>File</gui><gui>Print</gui></guiseq>, and in the <gui>Print</gui> dialog, 
+    choose <guiseq><gui>File</gui><gui>Print...</gui></guiseq>, and in the <gui>Print</gui> dialog,
     choose the <gui>Image Settings</gui> tab. In <gui>Image Settings</gui>, choose one of the 
     multiple-image-per-page options under <gui>Autosize</gui>.
     </p>