Skip to content

Commit

Permalink
Merge pull request #213 from jim-easterbrook/devel
Browse files Browse the repository at this point in the history
Devel
  • Loading branch information
jim-easterbrook committed Oct 5, 2023
2 parents 36e7ea1 + dc7637d commit 83699de
Show file tree
Hide file tree
Showing 12 changed files with 103 additions and 23 deletions.
25 changes: 13 additions & 12 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -144,34 +144,35 @@ Documentation licence
Permission is granted to copy, distribute and/or modify the Photini documentation under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
A copy of the license is included in the documentation section entitled "GNU Free Documentation License".

.. _blog post: http://jim-jotting.blogspot.co.uk/2012/10/photini-whats-in-name.html
.. _blog post:
https://www.jim-easterbrook.me.uk/2012/10/photini-whats-in-a-name/
.. _Flickr: http://www.flickr.com/
.. _Google Photos: https://photos.google.com/
.. _Google Maps Terms of Use:
http://www.google.com/help/terms_maps.html
http://www.google.com/help/terms_maps.html
.. _Google Privacy Policy:
http://www.google.com/policies/privacy/
http://www.google.com/policies/privacy/
.. _installation documentation:
http://photini.readthedocs.io/en/latest/other/installation.html
http://photini.readthedocs.io/en/latest/other/installation.html
.. _Ipernity: http://www.ipernity.com/
.. _"issues" page: https://github.com/jim-easterbrook/Photini/issues
.. _Linux Format: http://www.linuxformat.com/archives?issue=166
.. _localisation documentation:
http://photini.readthedocs.io/en/latest/other/localisation.html
http://photini.readthedocs.io/en/latest/other/localisation.html
.. _Mapbox terms of service:
https://www.mapbox.com/tos/
https://www.mapbox.com/tos/
.. _Mapbox privacy policy:
https://www.mapbox.com/privacy/
https://www.mapbox.com/privacy/
.. _Microsoft Bing Maps Terms of Use:
http://www.microsoft.com/maps/assets/docs/terms.aspx
http://www.microsoft.com/maps/assets/docs/terms.aspx
.. _Microsoft Privacy Statement:
http://www.microsoft.com/en-us/privacystatement/
http://www.microsoft.com/en-us/privacystatement/
.. _OAuth: http://oauth.net/
.. _OpenStreetMap licence:
http://www.openstreetmap.org/copyright
http://www.openstreetmap.org/copyright
.. _Photini team on Hosted Weblate:
https://hosted.weblate.org/projects/photini/
https://hosted.weblate.org/projects/photini/
.. _Pixelfed: https://pixelfed.org/
.. _Python keyring:
https://pypi.python.org/pypi/keyring#what-is-python-keyring-lib
https://pypi.python.org/pypi/keyring#what-is-python-keyring-lib
.. _Weblate: https://hosted.weblate.org
4 changes: 4 additions & 0 deletions src/doc/manual/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,10 @@ To enable BMFF file reading, edit the configuration file and set the ``enable_bm
[metadata]
enable_bmff = True
Note that this only affects Photini's ability to read and write BMFF metadata.
Reading image data (for thumbnails or the image regions tab) will probably need a Qt plugin to be installed.
This should be easy if you installed PyQt or PySide with your operating system's package manager, but is probably impossible if you installed PyQt or PySide with pip.

.. _Exiv2 warning:
https://github.com/exiv2/exiv2#support-for-bmff-files-cr3-heif-heic-and-avif
.. _gpxpy:
Expand Down
10 changes: 9 additions & 1 deletion src/lang/ca/LC_MESSAGES/documentation.po
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-06 11:34+0100\n"
"POT-Creation-Date: 2023-10-05 16:51+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: Joan <sacoo2@hotmail.com>, 2023\n"
"Language: ca\n"
Expand Down Expand Up @@ -359,6 +359,14 @@ msgid ""
"``enable_bmff`` option to ``True``:"
msgstr ""

msgid ""
"Note that this only affects Photini's ability to read and write BMFF "
"metadata. Reading image data (for thumbnails or the image regions tab) will "
"probably need a Qt plugin to be installed. This should be easy if you "
"installed PyQt or PySide with your operating system's package manager, but "
"is probably impossible if you installed PyQt or PySide with pip."
msgstr ""

msgid "Descriptive metadata"
msgstr ""

Expand Down
10 changes: 9 additions & 1 deletion src/lang/cs/LC_MESSAGES/documentation.po
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-06 11:34+0100\n"
"POT-Creation-Date: 2023-10-05 16:51+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: fri, 2023\n"
"Language: cs@qtfiletype\n"
Expand Down Expand Up @@ -356,6 +356,14 @@ msgid ""
"``enable_bmff`` option to ``True``:"
msgstr ""

msgid ""
"Note that this only affects Photini's ability to read and write BMFF "
"metadata. Reading image data (for thumbnails or the image regions tab) will "
"probably need a Qt plugin to be installed. This should be easy if you "
"installed PyQt or PySide with your operating system's package manager, but "
"is probably impossible if you installed PyQt or PySide with pip."
msgstr ""

msgid "Descriptive metadata"
msgstr ""

Expand Down
10 changes: 9 additions & 1 deletion src/lang/de/LC_MESSAGES/documentation.po
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-06 11:34+0100\n"
"POT-Creation-Date: 2023-10-05 16:51+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: Jim Easterbrook <jim@jim-easterbrook.me.uk>, 2023\n"
"Language: de\n"
Expand Down Expand Up @@ -352,6 +352,14 @@ msgid ""
"``enable_bmff`` option to ``True``:"
msgstr ""

msgid ""
"Note that this only affects Photini's ability to read and write BMFF "
"metadata. Reading image data (for thumbnails or the image regions tab) will "
"probably need a Qt plugin to be installed. This should be easy if you "
"installed PyQt or PySide with your operating system's package manager, but "
"is probably impossible if you installed PyQt or PySide with pip."
msgstr ""

msgid "Descriptive metadata"
msgstr ""

Expand Down
10 changes: 9 additions & 1 deletion src/lang/es/LC_MESSAGES/documentation.po
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-06 11:34+0100\n"
"POT-Creation-Date: 2023-10-05 16:51+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: Jim Easterbrook <jim@jim-easterbrook.me.uk>, 2023\n"
"Language: es@qtfiletype\n"
Expand Down Expand Up @@ -348,6 +348,14 @@ msgid ""
"``enable_bmff`` option to ``True``:"
msgstr ""

msgid ""
"Note that this only affects Photini's ability to read and write BMFF "
"metadata. Reading image data (for thumbnails or the image regions tab) will "
"probably need a Qt plugin to be installed. This should be easy if you "
"installed PyQt or PySide with your operating system's package manager, but "
"is probably impossible if you installed PyQt or PySide with pip."
msgstr ""

msgid "Descriptive metadata"
msgstr "Metadatos descriptivos"

Expand Down
10 changes: 9 additions & 1 deletion src/lang/fr/LC_MESSAGES/documentation.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-06 11:34+0100\n"
"POT-Creation-Date: 2023-10-05 16:51+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: Jim Easterbrook <jim@jim-easterbrook.me.uk>, 2023\n"
"Language: fr@qtfiletype\n"
Expand Down Expand Up @@ -343,6 +343,14 @@ msgid ""
"``enable_bmff`` option to ``True``:"
msgstr ""

msgid ""
"Note that this only affects Photini's ability to read and write BMFF "
"metadata. Reading image data (for thumbnails or the image regions tab) will "
"probably need a Qt plugin to be installed. This should be easy if you "
"installed PyQt or PySide with your operating system's package manager, but "
"is probably impossible if you installed PyQt or PySide with pip."
msgstr ""

msgid "Descriptive metadata"
msgstr ""

Expand Down
10 changes: 9 additions & 1 deletion src/lang/it/LC_MESSAGES/documentation.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-06 11:34+0100\n"
"POT-Creation-Date: 2023-10-05 16:51+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: alessio Cadore <alessiocadore@gmail.com>, 2023\n"
"Language: it@qtfiletype\n"
Expand Down Expand Up @@ -343,6 +343,14 @@ msgid ""
"``enable_bmff`` option to ``True``:"
msgstr ""

msgid ""
"Note that this only affects Photini's ability to read and write BMFF "
"metadata. Reading image data (for thumbnails or the image regions tab) will "
"probably need a Qt plugin to be installed. This should be easy if you "
"installed PyQt or PySide with your operating system's package manager, but "
"is probably impossible if you installed PyQt or PySide with pip."
msgstr ""

msgid "Descriptive metadata"
msgstr ""

Expand Down
10 changes: 9 additions & 1 deletion src/lang/ko/LC_MESSAGES/documentation.po
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-06 11:34+0100\n"
"POT-Creation-Date: 2023-10-05 16:51+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: Jim Easterbrook <jim@jim-easterbrook.me.uk>, 2023\n"
"Language: ko\n"
Expand Down Expand Up @@ -434,6 +434,14 @@ msgid ""
"``enable_bmff`` option to ``True``:"
msgstr "BMFF 파일 읽기를 활성화하려면 설정 파일을 편집하고 ``enable_bmff`` 옵션을 ``True`` 로 설정하십시오."

msgid ""
"Note that this only affects Photini's ability to read and write BMFF "
"metadata. Reading image data (for thumbnails or the image regions tab) will "
"probably need a Qt plugin to be installed. This should be easy if you "
"installed PyQt or PySide with your operating system's package manager, but "
"is probably impossible if you installed PyQt or PySide with pip."
msgstr ""

msgid "Descriptive metadata"
msgstr "설명 메타데이터"

Expand Down
10 changes: 9 additions & 1 deletion src/lang/nb/LC_MESSAGES/documentation.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-06 11:34+0100\n"
"POT-Creation-Date: 2023-10-05 16:51+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: Jim Easterbrook <jim@jim-easterbrook.me.uk>, 2023\n"
"Language: nb\n"
Expand Down Expand Up @@ -343,6 +343,14 @@ msgid ""
"``enable_bmff`` option to ``True``:"
msgstr ""

msgid ""
"Note that this only affects Photini's ability to read and write BMFF "
"metadata. Reading image data (for thumbnails or the image regions tab) will "
"probably need a Qt plugin to be installed. This should be easy if you "
"installed PyQt or PySide with your operating system's package manager, but "
"is probably impossible if you installed PyQt or PySide with pip."
msgstr ""

msgid "Descriptive metadata"
msgstr ""

Expand Down
10 changes: 9 additions & 1 deletion src/lang/pl/LC_MESSAGES/documentation.po
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-06 11:34+0100\n"
"POT-Creation-Date: 2023-10-05 16:51+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: Dawid Głaz, 2023\n"
"Language: pl@qtfiletype\n"
Expand Down Expand Up @@ -345,6 +345,14 @@ msgid ""
"``enable_bmff`` option to ``True``:"
msgstr ""

msgid ""
"Note that this only affects Photini's ability to read and write BMFF "
"metadata. Reading image data (for thumbnails or the image regions tab) will "
"probably need a Qt plugin to be installed. This should be easy if you "
"installed PyQt or PySide with your operating system's package manager, but "
"is probably impossible if you installed PyQt or PySide with pip."
msgstr ""

msgid "Descriptive metadata"
msgstr ""

Expand Down
7 changes: 5 additions & 2 deletions src/lang/templates/gettext/documentation.pot
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.5.2.post36\n"
"Project-Id-Version: Photini 2023.7.1.post18\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-06 11:34+0100\n"
"POT-Creation-Date: 2023-10-05 16:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -169,6 +169,9 @@ msgstr ""
msgid "To enable BMFF file reading, edit the configuration file and set the ``enable_bmff`` option to ``True``:"
msgstr ""

msgid "Note that this only affects Photini's ability to read and write BMFF metadata. Reading image data (for thumbnails or the image regions tab) will probably need a Qt plugin to be installed. This should be easy if you installed PyQt or PySide with your operating system's package manager, but is probably impossible if you installed PyQt or PySide with pip."
msgstr ""

msgid "Descriptive metadata"
msgstr ""

Expand Down

0 comments on commit 83699de

Please sign in to comment.