From 4e10e30c2f99d552239871aa1b27a08a6c18f1a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 5 Jun 2016 04:23:39 +0200 Subject: Imported Upstream version 0.23.1 --- help/C/edit-adjustments.page | 2 +- help/C/edit-crop.page | 2 +- help/C/edit-date-time.page | 20 ++++++++++++++++++++ help/C/edit-nondestructive.page | 2 +- help/C/edit-straighten.page | 2 +- help/C/edit-time-date.page | 21 --------------------- help/C/formats.page | 0 help/C/import-file.page | 2 +- help/C/import-memorycard.page | 2 +- help/C/organize-event.page | 4 ++-- help/C/organize-search.page | 8 ++++---- help/C/organize-tag.page | 18 +++++++++--------- help/C/organize-title.page | 2 +- help/C/share-background.page | 2 +- help/C/share-export.page | 2 +- help/C/share-print.page | 6 +++--- 16 files changed, 47 insertions(+), 48 deletions(-) create mode 100644 help/C/edit-date-time.page delete mode 100644 help/C/edit-time-date.page mode change 100755 => 100644 help/C/formats.page (limited to 'help/C') 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 @@

The Enhance button adjusts the histogram and shadows sliders to improve the quality of a photo.

-

When the photo's colors and contrast are to your liking, press Apply to save the changes. Reset will return the image to its original state. Cancel discards all changes you've made.

+

When the photo's colors and contrast are to your liking, press OK to save the changes. Reset will return the image to its original state. Cancel discards all changes you've made.

What do the color adjustments do? 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 @@

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).

-

When you're happy with your crop outline, press the Apply button. Shotwell will display the cropped photo.

+

When you're happy with your crop outline, apply it by pressing the Crop button. Shotwell will display the cropped photo.

If you change your mind, press the Crop button again and fine-tune the crop.

diff --git a/help/C/edit-date-time.page b/help/C/edit-date-time.page new file mode 100644 index 0000000..846c8a8 --- /dev/null +++ b/help/C/edit-date-time.page @@ -0,0 +1,20 @@ + + + + + Change the date and time of photos if those details are incorrect. + + + + + Adjust the date and time of photos + +

To adjust the date and time of photos, select the photos you would like to adjust, choose PhotosAdjust Date and Time... and select a new date and time.

+ +

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.

+ +

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.

+ + 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 @@ Shotwell is a non-destructive photo editor - it does not modify your original photos. - + What happens to the original when I edit a photo? 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 @@

Drag the slider to achieve the desired degree of straightening.

 -

Press OK when finished.

+

Press Straighten when finished.

 diff --git a/help/C/edit-time-date.page b/help/C/edit-time-date.page deleted file mode 100644 index 2f3f03c..0000000 --- a/help/C/edit-time-date.page +++ /dev/null @@ -1,21 +0,0 @@ - - - - - Change the time and date of photos if those details are incorrect. - - - - - Adjust the time and date of photos - -

To adjust the time and date of photos, select the photos you would like to adjust, choose PhotosAdjust Time and Date and select a new time and date.

- -

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.

- -

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.

- - - diff --git a/help/C/formats.page b/help/C/formats.page old mode 100755 new mode 100644 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 @@

To import photo files from your hard disk into Shotwell, just drag them from your file browser into the Shotwell window.

-

Alternatively, click FileImport From Folder and select the folder containing the photos you want to import.

+

Alternatively, click FileImport From Folder... and select the folder containing the photos you want to import.

Shotwell will ask whether you want to copy the photo files to your library folder (usually this is the Pictures folder in your home directory) or to import them in place without copying the files.

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 @@

The card reader and card should be detected automatically.

-

Follow the instructions for importing photos from your hard disk. If you click FileImport From Folder, the memory card should be visible as a folder in the side bar of the file selection window.

+

Follow the instructions for importing photos from your hard disk. If you click FileImport From Folder..., the memory card should be visible as a folder in the side bar of the file selection window.

 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 @@
Renaming events -

To give an event a name rather than referring to it by its date, select the event, click EditRename Event 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 Enter.

+

To give an event a name rather than referring to it by its date, select the event, click EventsRename Event... 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 Enter.

@@ -50,7 +50,7 @@
Change the photo used to represent each event -

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.

+

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.

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 PhotosMake Key Photo for Event.

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 @@

- Create a new saved search with EditNew Search or by hitting + Create a new saved search with EditNew Saved Search... or by hitting CtrlS. 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.

- 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 + 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.

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 @@

-

Choose TagsAdd Tags.

 +

Choose TagsAdd Tags....

Type CtrlT.

Drag the selected photos and drop them on the desired tag.

When you use CtrlT or - TagsAdd Tags you can type + TagsAdd Tags... 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 - TagsRename Tag "[name]", - by rightclicking on it and choose Rename... or + TagsRename Tag "[name]"..., + by rightclicking on it and choose Rename... or double-click on the tag in the sidebar.

To change which tags are associated with a particular photo, select that photo, choose - TagsModify Tags or - right-click on a photo and select Modify Tags and + TagsModify Tags... or + right-click on a photo and select Modify Tags... 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 @@

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 + 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 associated with that tag.

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.

To change a photo's title, -select the photo and click PhotosEdit Title, or press F2.

+select the photo and click PhotosEdit Title..., or press F2.

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 @@

To set a single photo as your desktop background, select the photo and choose FileSet as Desktop Background.

You can also set your background to a slideshow of photos. To do this, select the photos for - the slideshow and choose FileSet as Desktop Slideshow. + the slideshow and choose FileSet as Desktop Slideshow.... 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.

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.

-Alternatively, select a set of photos and choose the FileExport command or press ShiftCtrlE, 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 FileExport... command or press ShiftCtrlE, 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:

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 @@ - Click FilePrint. For more printing options, select the Page Setup tab in the Print dialog. + Click FilePrint.... For more printing options, select the Page Setup tab in the Print dialog. Printing -

To print a photo, select it and choose FilePrint.

+

To print a photo, select it and choose FilePrint....

Shotwell can also print multiple images in one page; to do this, select multiple images, - choose FilePrint, and in the Print dialog, + choose FilePrint..., and in the Print dialog, choose the Image Settings tab. In Image Settings, choose one of the multiple-image-per-page options under Autosize.

-- cgit v1.2.3