Merge pull request #273 from jim-easterbrook/devel

Devel

src/doc/manual/technical_metadata.rst

@@ -1,5 +1,5 @@
 .. This is part of the Photini documentation.
-   Copyright (C)  2012-21  Jim Easterbrook.
+   Copyright (C)  2012-24  Jim Easterbrook.
    See the file ../DOC_LICENSE.txt for copying conditions.
 
 Technical metadata
@@ -20,32 +20,37 @@ You may wish to unlink the three entries and adjust the dates or times separatel
 For example, you could use the ``modified`` entry to note when you have edited the metadata with Photini.
 If you scan some old photographs you should set the ``taken`` entry to when the photographs were taken and the ``digitised`` entry to when you scanned them.
 
+.. image:: ../images/screenshot_101.png
+
 The date can be picked from a calendar widget that pops up when you click on the down arrow in a date/time entry.
+
+.. image:: ../images/screenshot_102.png
+
 Clicking on any of the numbers allows them to be adjusted with your keyboard up & down arrow keys.
 You can also double click on any of the numbers to select it and type a new value in directly.
-Selecting all the numbers, e.g. with ``Ctrl+A``, allows them to be deleted which removes the date & time metadata from the photograph(s).
+Selecting the entire date and time, e.g. with ``Ctrl+A``, allows it to be deleted which removes the date & time metadata from the photograph(s).
 
-.. image:: ../images/screenshot_101.png
+.. image:: ../images/screenshot_103.png
 
 To the right of each date/time is a widget to adjust the time zone.
 The time a photograph was taken is assumed to be "local time".
 The time zone records how many hours & minutes offset from UTC (or GMT) the local time zone was when the photograph was taken, digitised or modified.
 
-.. image:: ../images/screenshot_102.png
+.. image:: ../images/screenshot_104.png
 
 The ``Adjust times`` field allows a constant offset to be applied to the ``taken`` time stamps of several pictures at once.
 (The other time stamps are also adjusted if the ``link ...`` boxes are checked.)
 This can be useful if you are in a different time zone to your camera's setting or you forgot to set your camera's clock before a day's shooting!
 Set the required offset hours, minutes & seconds, then use the ``+`` or ``-`` button to add or subtract that amount from each selected picture's timestamp.
 
-.. image:: ../images/screenshot_103.png
+.. image:: ../images/screenshot_105.png
 
 You can also offset the time zone.
 In this example my camera clock was set to British Summer Time (+01:00) but records timestamps without zone information.
 I was on holiday in mainland Europe (+02:00) so I need to add 1 hour to each timestamp and 2 hours to the time zone.
 The ``Adjust times`` values are stored in Photini's configuration file, so each day's photos can be given the same offset with just one button click.
 
-.. image:: ../images/screenshot_104.png
+.. image:: ../images/screenshot_106.png
 
 Below each date/time is a slider that allows you to set the precision.
 At its maximum value the time is shown to a precision of 1 millisecond.
@@ -58,78 +63,77 @@ The ``Orientation`` value sets the required rotation or reflection to display th
 Note that this does not actually transform the image data.
 Image display programs should rotate or reflect the image according to the orientation metadata, but not all of them do.
 
-.. image:: ../images/screenshot_105.png
+.. image:: ../images/screenshot_107.png
 
 The ``Camera`` dropdown list shows the camera model and serial number, if known.
 You can choose a different camera from the list, or click on ``<new>`` to add another camera.
 
-.. image:: ../images/screenshot_106.png
+.. image:: ../images/screenshot_108.png
 
 It is quite common for the maker's name to appear in the model name, as shown here, but it doesn't have to.
 The serial number is optional, but could be useful if you have more than one of the same model of camera.
 
-.. image:: ../images/screenshot_107.png
+.. image:: ../images/screenshot_109.png
 
 After changing the camera you may see this warning message.
 The makernote_ is a block of proprietary data stored in a photograph's Exif metadata.
 If you change the camera maker then other software (such as the libexiv2 package used by Photini) may no longer be able to decode the makernote.
 Deleting the makernote prevents any such errors, but if you have any proprietary software that uses the makernote it may no longer work correctly.
 
-.. image:: ../images/screenshot_108.png
+.. image:: ../images/screenshot_110.png
 
 The ``Lens model`` dropdown list allows you to change the lens specification stored in the image metadata.
 This should not usually be changed for cameras with non-removable lenses, but may be useful if you have an SLR that you use with lenses that its electronics doesn't recognise.
 
 This is particularly useful if you use your camera with 3rd party lenses and/or telescopes via a T-thread adaptor.
-My adaptor identifies itself to the camera as a 50mm f/1.8 lens.
-Here I've used it with my 500mm mirror lens to take some pictures of the moon.
+My adaptor identifies itself to the camera as a 50 mm ƒ/1.8 lens.
+Here I've used it with my 500 mm mirror lens to take some pictures of the moon.
 
-.. image:: ../images/screenshot_109.png
+.. image:: ../images/screenshot_111.png
 
 Selecting ``<new>`` from the dropdown list allows me to enter details of my mirror lens.
+
+.. image:: ../images/screenshot_112.png
+
 As it is not a zoom lens there is no need to fill in the maximum focal length details.
 Only the ``Model name`` and ``Minimum focal length`` are required information.
 
-.. image:: ../images/screenshot_110.png
-
 The data you enter is stored in the Photini configuration file so you can easily apply it to images in future by selecting the lens you have defined from the dropdown list.
 
-.. image:: ../images/screenshot_111.png
+.. image:: ../images/screenshot_113.png
 
 When the lens model is changed Photini offers the option to adjust the focal length and aperture used for each image, if the current values are inconsistent with the new lens.
 In this case I definitely do want to update these parameters so I click on ``Yes``.
 
-.. image:: ../images/screenshot_112.png
+.. image:: ../images/screenshot_114.png
 
-When the mouse pointer is held over the lens model dropdown for a few seconds a "tooltip" shows the focal length and aperture details of the lens.
+When the mouse pointer is held over the lens model dropdown for a few seconds a "tooltip" shows the focal length and aperture details of the lens, if known.
 This can be useful if they're not obvious from the lens model name.
 
-.. image:: ../images/screenshot_113.png
+.. image:: ../images/screenshot_115.png
 
 To remove a lens from the list right-click on the list to bring up its context menu.
 This includes options to delete any lens but the one currently in use.
 
-
-.. image:: ../images/screenshot_114.png
+.. image:: ../images/screenshot_116.png
 
 The ``35mm equiv`` field shows the "`35mm equivalent focal length <https://en.wikipedia.org/wiki/35_mm_equivalent_focal_length>`_" of the actual focal length.
 These two numbers are related by the camera's "`crop factor <https://en.wikipedia.org/wiki/Crop_factor>`_".
-Some cameras store both focal length numbers in the image metadata.
-In this case both numbers are shown normally.
+Some cameras store both focal length numbers in the image metadata, in which case both numbers are shown normally.
 If the 35mm equivalent focal length is not present Photini attempts to calculate it from the actual focal length and other metadata.
-These calculated values are shown in faint text.
+The calculated value is shown in faint text.
 
-.. image:: ../images/screenshot_115.png
+.. image:: ../images/screenshot_117.png
 
 If you know your camera's crop factor you can correct Photini's calculation by typing in the correct 35mm equivalent focal length.
 Photini will then store the crop factor for that camera model in its config file for future use.
 
-.. image:: ../images/screenshot_116.png
+.. image:: ../images/screenshot_118.png
 
 If you don't want to store the 35mm equivalent focal length you entered in the photograph's metadata you can undo the edit by reloading the metadata.
 Right-click on the thumbnail and select ``reload file`` from the context menu.
 
-.. image:: ../images/screenshot_117.png
+.. image:: ../images/screenshot_119.png
 
 Now the 35mm equivalent focal length is computed using the correct crop factor.
 

src/lang/ca/LC_MESSAGES/documentation.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Photini 2023.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-13 10:46+0100\n"
+"POT-Creation-Date: 2024-09-13 12:34+0100\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: Joan <[email protected]>, 2023\n"
 "Language: ca\n"
@@ -2251,11 +2251,15 @@ msgstr ""
 
 msgid ""
 "The date can be picked from a calendar widget that pops up when you click on"
-" the down arrow in a date/time entry. Clicking on any of the numbers allows "
-"them to be adjusted with your keyboard up & down arrow keys. You can also "
-"double click on any of the numbers to select it and type a new value in "
-"directly. Selecting all the numbers, e.g. with ``Ctrl+A``, allows them to be"
-" deleted which removes the date & time metadata from the photograph(s)."
+" the down arrow in a date/time entry."
+msgstr ""
+
+msgid ""
+"Clicking on any of the numbers allows them to be adjusted with your keyboard"
+" up & down arrow keys. You can also double click on any of the numbers to "
+"select it and type a new value in directly. Selecting the entire date and "
+"time, e.g. with ``Ctrl+A``, allows it to be deleted which removes the date &"
+" time metadata from the photograph(s)."
 msgstr ""
 
 msgid ""
@@ -2333,15 +2337,19 @@ msgstr ""
 msgid ""
 "This is particularly useful if you use your camera with 3rd party lenses "
 "and/or telescopes via a T-thread adaptor. My adaptor identifies itself to "
-"the camera as a 50mm f/1.8 lens. Here I've used it with my 500mm mirror lens"
-" to take some pictures of the moon."
+"the camera as a 50 mm ƒ/1.8 lens. Here I've used it with my 500 mm mirror "
+"lens to take some pictures of the moon."
 msgstr ""
 
 msgid ""
 "Selecting ``<new>`` from the dropdown list allows me to enter details of my "
-"mirror lens. As it is not a zoom lens there is no need to fill in the "
-"maximum focal length details. Only the ``Model name`` and ``Minimum focal "
-"length`` are required information."
+"mirror lens."
+msgstr ""
+
+msgid ""
+"As it is not a zoom lens there is no need to fill in the maximum focal "
+"length details. Only the ``Model name`` and ``Minimum focal length`` are "
+"required information."
 msgstr ""
 
 msgid ""
@@ -2360,7 +2368,8 @@ msgstr ""
 msgid ""
 "When the mouse pointer is held over the lens model dropdown for a few "
 "seconds a \"tooltip\" shows the focal length and aperture details of the "
-"lens. This can be useful if they're not obvious from the lens model name."
+"lens, if known. This can be useful if they're not obvious from the lens "
+"model name."
 msgstr ""
 
 msgid ""
@@ -2374,10 +2383,10 @@ msgid ""
 "<https://en.wikipedia.org/wiki/35_mm_equivalent_focal_length>`_\" of the "
 "actual focal length. These two numbers are related by the camera's \"`crop "
 "factor <https://en.wikipedia.org/wiki/Crop_factor>`_\". Some cameras store "
-"both focal length numbers in the image metadata. In this case both numbers "
+"both focal length numbers in the image metadata, in which case both numbers "
 "are shown normally. If the 35mm equivalent focal length is not present "
 "Photini attempts to calculate it from the actual focal length and other "
-"metadata. These calculated values are shown in faint text."
+"metadata. The calculated value is shown in faint text."
 msgstr ""
 
 msgid ""
@@ -4852,3 +4861,69 @@ msgstr ""
 #~ "get some diagnostic information:"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "The date can be picked from a "
+#~ "calendar widget that pops up when you"
+#~ " click on the down arrow in a "
+#~ "date/time entry. Clicking on any of "
+#~ "the numbers allows them to be "
+#~ "adjusted with your keyboard up & down"
+#~ " arrow keys. You can also double "
+#~ "click on any of the numbers to "
+#~ "select it and type a new value "
+#~ "in directly. Selecting all the numbers, "
+#~ "e.g. with ``Ctrl+A``, allows them to "
+#~ "be deleted which removes the date &"
+#~ " time metadata from the photograph(s)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is particularly useful if you "
+#~ "use your camera with 3rd party lenses"
+#~ " and/or telescopes via a T-thread "
+#~ "adaptor. My adaptor identifies itself to"
+#~ " the camera as a 50mm f/1.8 lens."
+#~ " Here I've used it with my 500mm"
+#~ " mirror lens to take some pictures "
+#~ "of the moon."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Selecting ``<new>`` from the dropdown list"
+#~ " allows me to enter details of my"
+#~ " mirror lens. As it is not a "
+#~ "zoom lens there is no need to "
+#~ "fill in the maximum focal length "
+#~ "details. Only the ``Model name`` and "
+#~ "``Minimum focal length`` are required "
+#~ "information."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "When the mouse pointer is held over"
+#~ " the lens model dropdown for a few"
+#~ " seconds a \"tooltip\" shows the focal"
+#~ " length and aperture details of the "
+#~ "lens. This can be useful if they're"
+#~ " not obvious from the lens model "
+#~ "name."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The ``35mm equiv`` field shows the "
+#~ "\"`35mm equivalent focal length "
+#~ "<https://en.wikipedia.org/wiki/35_mm_equivalent_focal_length>`_\" "
+#~ "of the actual focal length. These two"
+#~ " numbers are related by the camera's "
+#~ "\"`crop factor "
+#~ "<https://en.wikipedia.org/wiki/Crop_factor>`_\". Some cameras"
+#~ " store both focal length numbers in "
+#~ "the image metadata. In this case both"
+#~ " numbers are shown normally. If the "
+#~ "35mm equivalent focal length is not "
+#~ "present Photini attempts to calculate it"
+#~ " from the actual focal length and "
+#~ "other metadata. These calculated values are"
+#~ " shown in faint text."
+#~ msgstr ""
+