Skip to content

Commit

Permalink
Merge pull request #166 from jim-easterbrook/devel
Browse files Browse the repository at this point in the history 
Devel
  • Loading branch information
@jim-easterbrook
jim-easterbrook committed Apr 10, 2023
2 parents b4de385 + ac977a5 commit 24f2912
Show file tree
Hide file tree
Showing 54 changed files with 293 additions and 185 deletions.
1 change: 1 addition & 0 deletions setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
'google' : ['requests-oauthlib', 'keyring'],
'importer' : ['gphoto2; platform_system != "Windows"'],
'ipernity' : ['requests-toolbelt', 'keyring'],
'pixelfed' : ['requests-oauthlib', 'requests-toolbelt', 'keyring'],
'spelling' : ['pyenchant'],
# the following are intended for use by the photini-configure script
'PySide2' : ['PySide2'],
Expand Down
Binary file removed src/doc/images/screenshot_151b.png
View file
Binary file not shown.
Binary file removed src/doc/images/screenshot_151c.png
View file
Binary file not shown.
11 changes: 1 addition & 10 deletions src/doc/manual/flickr.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,9 @@ It's only usable after you've authorised Photini to access your Flickr account b
The first time you click ``Log in`` Photini connects your web browser to Flickr, from where you can log in and give Photini permission to access Flickr on your behalf.
(Note that Photini does not interact with other people's photos and videos.)

.. image:: ../images/screenshot_151b.png

In January 2020 Flickr introduced a bug in the authorisation process.
They change the "callback URL" from HTTP to HTTPS, which causes an error like the one shown above.
(Other browsers may show a different error.)

.. image:: ../images/screenshot_151c.png

The workaround is to click on the browser's URL display, change "https" to "http", then hit the return key.

.. image:: ../images/screenshot_151d.png

After authorisation your browser should display this page.
The web browser window can then be closed.

.. image:: ../images/screenshot_152.png
Expand Down
2 changes: 1 addition & 1 deletion src/doc/other/installation.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ These are all required for Photini to be usable.
Package Minimum version Typical Linux package name PyPI package name
============================= ================= ================================ =================
Python_ 3.6 ``python3``
PyQt_ [1] 5.9 ``python3-qt5``
PyQt_ [1] 5.11 ``python3-qt5``
or ``python3-pyqt5``
or ``python310-PyQt6``
PySide2_ [1] 5.11.0 ``python3-pyside2`` PySide2
Expand Down
2 changes: 1 addition & 1 deletion src/lang/ca/LC_MESSAGES/index.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2022.6.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-28 13:22+0100\n"
"POT-Creation-Date: 2023-04-10 10:12+0100\n"
"PO-Revision-Date: 2022-06-30 12:10+0000\n"
"Last-Translator: Joan <[email protected]>, 2022\n"
"Language: ca\n"
Expand Down
33 changes: 21 additions & 12 deletions src/lang/ca/LC_MESSAGES/manual.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2022.6.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-28 13:22+0100\n"
"POT-Creation-Date: 2023-04-10 10:12+0100\n"
"PO-Revision-Date: 2022-06-28 09:10+0000\n"
"Last-Translator: Joan <[email protected]>, 2022\n"
"Language: ca\n"
Expand Down Expand Up @@ -575,17 +575,8 @@ msgid ""
msgstr ""

msgid ""
"In January 2020 Flickr introduced a bug in the authorisation process. They "
"change the \"callback URL\" from HTTP to HTTPS, which causes an error like "
"the one shown above. (Other browsers may show a different error.)"
msgstr ""

msgid ""
"The workaround is to click on the browser's URL display, change \"https\" to"
" \"http\", then hit the return key."
msgstr ""

msgid "The web browser window can then be closed."
"After authorisation your browser should display this page. The web browser "
"window can then be closed."
msgstr ""

msgid ""
Expand Down Expand Up @@ -2472,3 +2463,21 @@ msgstr ""
#~ msgid "Xmp.aux.SerialNumber"
#~ msgstr ""

#~ msgid ""
#~ "In January 2020 Flickr introduced a "
#~ "bug in the authorisation process. They "
#~ "change the \"callback URL\" from HTTP "
#~ "to HTTPS, which causes an error like"
#~ " the one shown above. (Other browsers"
#~ " may show a different error.)"
#~ msgstr ""

#~ msgid ""
#~ "The workaround is to click on the "
#~ "browser's URL display, change \"https\" to"
#~ " \"http\", then hit the return key."
#~ msgstr ""

#~ msgid "The web browser window can then be closed."
#~ msgstr ""

2 changes: 1 addition & 1 deletion src/lang/ca/LC_MESSAGES/misc.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2022.6.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-28 13:22+0100\n"
"POT-Creation-Date: 2023-04-10 10:12+0100\n"
"PO-Revision-Date: 2022-06-28 09:10+0000\n"
"Last-Translator: Joan <[email protected]>, 2022\n"
"Language: ca\n"
Expand Down
7 changes: 5 additions & 2 deletions src/lang/ca/LC_MESSAGES/other.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-28 13:22+0100\n"
"POT-Creation-Date: 2023-04-10 10:12+0100\n"
"PO-Revision-Date: 2021-06-14 10:52+0000\n"
"Last-Translator: Jim Easterbrook <[email protected]>\n"
"Language: ca\n"
Expand Down Expand Up @@ -326,7 +326,7 @@ msgstr ""
msgid "PyQt_ [1]"
msgstr ""

msgid "5.9"
msgid "5.11"
msgstr ""

msgid "``python3-qt5`` or ``python3-pyqt5`` or ``python310-PyQt6``"
Expand Down Expand Up @@ -3023,3 +3023,6 @@ msgstr ""
#~ msgid "0.13.2"
#~ msgstr ""

#~ msgid "5.9"
#~ msgstr ""

2 changes: 1 addition & 1 deletion src/lang/cs/LC_MESSAGES/index.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2022.7.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-28 13:22+0100\n"
"POT-Creation-Date: 2023-04-10 10:12+0100\n"
"PO-Revision-Date: 2022-07-02 10:41+0000\n"
"Last-Translator: fri, 2022\n"
"Language: cs\n"
Expand Down
33 changes: 21 additions & 12 deletions src/lang/cs/LC_MESSAGES/manual.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2022.6.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-28 13:22+0100\n"
"POT-Creation-Date: 2023-04-10 10:12+0100\n"
"PO-Revision-Date: 2022-06-28 09:10+0000\n"
"Last-Translator: Jim Easterbrook <[email protected]>, 2022\n"
"Language: cs\n"
Expand Down Expand Up @@ -573,17 +573,8 @@ msgid ""
msgstr ""

msgid ""
"In January 2020 Flickr introduced a bug in the authorisation process. They "
"change the \"callback URL\" from HTTP to HTTPS, which causes an error like "
"the one shown above. (Other browsers may show a different error.)"
msgstr ""

msgid ""
"The workaround is to click on the browser's URL display, change \"https\" to"
" \"http\", then hit the return key."
msgstr ""

msgid "The web browser window can then be closed."
"After authorisation your browser should display this page. The web browser "
"window can then be closed."
msgstr ""

msgid ""
Expand Down Expand Up @@ -2470,3 +2461,21 @@ msgstr ""
#~ msgid "Xmp.aux.SerialNumber"
#~ msgstr ""

#~ msgid ""
#~ "In January 2020 Flickr introduced a "
#~ "bug in the authorisation process. They "
#~ "change the \"callback URL\" from HTTP "
#~ "to HTTPS, which causes an error like"
#~ " the one shown above. (Other browsers"
#~ " may show a different error.)"
#~ msgstr ""

#~ msgid ""
#~ "The workaround is to click on the "
#~ "browser's URL display, change \"https\" to"
#~ " \"http\", then hit the return key."
#~ msgstr ""

#~ msgid "The web browser window can then be closed."
#~ msgstr ""

2 changes: 1 addition & 1 deletion src/lang/cs/LC_MESSAGES/misc.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.2.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-28 13:22+0100\n"
"POT-Creation-Date: 2023-04-10 10:12+0100\n"
"PO-Revision-Date: 2023-02-18 14:56+0000\n"
"Last-Translator: Jim Easterbrook <[email protected]>, 2023\n"
"Language: cs\n"
Expand Down
10 changes: 7 additions & 3 deletions src/lang/cs/LC_MESSAGES/other.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2022.7.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-28 13:22+0100\n"
"POT-Creation-Date: 2023-04-10 10:12+0100\n"
"PO-Revision-Date: 2022-07-02 10:40+0000\n"
"Last-Translator: fri, 2022\n"
"Language: cs\n"
Expand Down Expand Up @@ -410,8 +410,9 @@ msgstr "python3"
msgid "PyQt_ [1]"
msgstr "PyQt_ [1]"

msgid "5.9"
msgstr "5.9"
#, fuzzy
msgid "5.11"
msgstr "5.11.0"

#, fuzzy
msgid "``python3-qt5`` or ``python3-pyqt5`` or ``python310-PyQt6``"
Expand Down Expand Up @@ -1724,3 +1725,6 @@ msgstr ""
#~ msgid "0.13.2"
#~ msgstr "0.11.0"

#~ msgid "5.9"
#~ msgstr "5.9"

2 changes: 1 addition & 1 deletion src/lang/de/LC_MESSAGES/index.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2022.6.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-28 13:22+0100\n"
"POT-Creation-Date: 2023-04-10 10:12+0100\n"
"PO-Revision-Date: 2022-06-30 12:10+0000\n"
"Last-Translator: Jim Easterbrook <[email protected]>, 2022\n"
"Language: de\n"
Expand Down
33 changes: 21 additions & 12 deletions src/lang/de/LC_MESSAGES/manual.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2022.6.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-28 13:22+0100\n"
"POT-Creation-Date: 2023-04-10 10:12+0100\n"
"PO-Revision-Date: 2022-06-28 09:10+0000\n"
"Last-Translator: Jim Easterbrook <[email protected]>, 2022\n"
"Language: de\n"
Expand Down Expand Up @@ -579,17 +579,8 @@ msgid ""
msgstr ""

msgid ""
"In January 2020 Flickr introduced a bug in the authorisation process. They "
"change the \"callback URL\" from HTTP to HTTPS, which causes an error like "
"the one shown above. (Other browsers may show a different error.)"
msgstr ""

msgid ""
"The workaround is to click on the browser's URL display, change \"https\" to"
" \"http\", then hit the return key."
msgstr ""

msgid "The web browser window can then be closed."
"After authorisation your browser should display this page. The web browser "
"window can then be closed."
msgstr ""

msgid ""
Expand Down Expand Up @@ -2476,3 +2467,21 @@ msgstr ""
#~ msgid "Xmp.aux.SerialNumber"
#~ msgstr ""

#~ msgid ""
#~ "In January 2020 Flickr introduced a "
#~ "bug in the authorisation process. They "
#~ "change the \"callback URL\" from HTTP "
#~ "to HTTPS, which causes an error like"
#~ " the one shown above. (Other browsers"
#~ " may show a different error.)"
#~ msgstr ""

#~ msgid ""
#~ "The workaround is to click on the "
#~ "browser's URL display, change \"https\" to"
#~ " \"http\", then hit the return key."
#~ msgstr ""

#~ msgid "The web browser window can then be closed."
#~ msgstr ""

2 changes: 1 addition & 1 deletion src/lang/de/LC_MESSAGES/misc.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2022.6.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-28 13:22+0100\n"
"POT-Creation-Date: 2023-04-10 10:12+0100\n"
"PO-Revision-Date: 2022-06-28 09:10+0000\n"
"Last-Translator: Ettore Atalan <[email protected]>, 2022\n"
"Language: de\n"
Expand Down
7 changes: 5 additions & 2 deletions src/lang/de/LC_MESSAGES/other.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2022.6.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-28 13:22+0100\n"
"POT-Creation-Date: 2023-04-10 10:12+0100\n"
"PO-Revision-Date: 2022-06-28 09:10+0000\n"
"Last-Translator: Ettore Atalan <[email protected]>, 2022\n"
"Language: de\n"
Expand Down Expand Up @@ -318,7 +318,7 @@ msgstr ""
msgid "PyQt_ [1]"
msgstr ""

msgid "5.9"
msgid "5.11"
msgstr ""

msgid "``python3-qt5`` or ``python3-pyqt5`` or ``python310-PyQt6``"
Expand Down Expand Up @@ -1714,3 +1714,6 @@ msgstr ""
#~ msgid "0.13.2"
#~ msgstr ""

#~ msgid "5.9"
#~ msgstr ""

2 changes: 1 addition & 1 deletion src/lang/es/LC_MESSAGES/index.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2022.6.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-28 13:22+0100\n"
"POT-Creation-Date: 2023-04-10 10:12+0100\n"
"PO-Revision-Date: 2022-06-30 12:10+0000\n"
"Last-Translator: Jim Easterbrook <[email protected]>, 2022\n"
"Language: es\n"
Expand Down
33 changes: 21 additions & 12 deletions src/lang/es/LC_MESSAGES/manual.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2022.6.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-28 13:22+0100\n"
"POT-Creation-Date: 2023-04-10 10:12+0100\n"
"PO-Revision-Date: 2022-06-28 09:10+0000\n"
"Last-Translator: Esteban Martinena Guerrero <[email protected]>, 2022\n"
"Language: es\n"
Expand Down Expand Up @@ -576,17 +576,8 @@ msgid ""
msgstr ""

msgid ""
"In January 2020 Flickr introduced a bug in the authorisation process. They "
"change the \"callback URL\" from HTTP to HTTPS, which causes an error like "
"the one shown above. (Other browsers may show a different error.)"
msgstr ""

msgid ""
"The workaround is to click on the browser's URL display, change \"https\" to"
" \"http\", then hit the return key."
msgstr ""

msgid "The web browser window can then be closed."
"After authorisation your browser should display this page. The web browser "
"window can then be closed."
msgstr ""

msgid ""
Expand Down Expand Up @@ -2473,3 +2464,21 @@ msgstr ""
#~ msgid "Xmp.aux.SerialNumber"
#~ msgstr ""

#~ msgid ""
#~ "In January 2020 Flickr introduced a "
#~ "bug in the authorisation process. They "
#~ "change the \"callback URL\" from HTTP "
#~ "to HTTPS, which causes an error like"
#~ " the one shown above. (Other browsers"
#~ " may show a different error.)"
#~ msgstr ""

#~ msgid ""
#~ "The workaround is to click on the "
#~ "browser's URL display, change \"https\" to"
#~ " \"http\", then hit the return key."
#~ msgstr ""

#~ msgid "The web browser window can then be closed."
#~ msgstr ""

2 changes: 1 addition & 1 deletion src/lang/es/LC_MESSAGES/misc.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-28 13:22+0100\n"
"POT-Creation-Date: 2023-04-10 10:12+0100\n"
"PO-Revision-Date: 2017-08-16 11:26+0000\n"
"Last-Translator: Jim Easterbrook <[email protected]>\n"
"Language: es\n"
Expand Down
Loading

0 comments on commit 24f2912

Please sign in to comment.