From 9a1e1ec6459df11c13443637058b6d72e232c5fa Mon Sep 17 00:00:00 2001 From: Jim Easterbrook Date: Tue, 28 Mar 2023 13:39:19 +0100 Subject: [PATCH 01/11] Add Pixelfed to photini-configure script options --- setup.py | 1 + src/photini/__init__.py | 2 +- src/photini/scripts.py | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2d4c6f12..336cdd79 100644 --- a/setup.py +++ b/setup.py @@ -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'], diff --git a/src/photini/__init__.py b/src/photini/__init__.py index 15927443..e4ed7fc6 100644 --- a/src/photini/__init__.py +++ b/src/photini/__init__.py @@ -1,4 +1,4 @@ """Full documentation is at https://photini.readthedocs.io/""" __version__ = '2023.3.0' -build = '2648 (9919754)' +build = '2649 (7f7f4b2)' diff --git a/src/photini/scripts.py b/src/photini/scripts.py index c4ffff2c..9604d0f1 100644 --- a/src/photini/scripts.py +++ b/src/photini/scripts.py @@ -86,6 +86,8 @@ def configure(argv=None): ('google', 'photini.googlephotos', 'upload pictures to Google Photos'), ('ipernity', 'photini.ipernity', 'upload pictures to Ipernity'), + ('pixelfed', 'photini.pixelfed', + 'upload pictures to Pixelfed or Mastodon'), ('spelling', None, 'check spelling of metadata'), ('gpxpy', None, 'import GPS track data'), ('Pillow', None, 'make higher quality thumbnails')] From 861530c8a10879335b75f4b712c23576f92d4dc2 Mon Sep 17 00:00:00 2001 From: Jim Easterbrook Date: Tue, 28 Mar 2023 17:15:56 +0100 Subject: [PATCH 02/11] Remove cross from dragging Google Map marker --- src/photini/__init__.py | 2 +- src/photini/data/googlemap/script.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/photini/__init__.py b/src/photini/__init__.py index e4ed7fc6..f647c6a0 100644 --- a/src/photini/__init__.py +++ b/src/photini/__init__.py @@ -1,4 +1,4 @@ """Full documentation is at https://photini.readthedocs.io/""" __version__ = '2023.3.0' -build = '2649 (7f7f4b2)' +build = '2650 (9a1e1ec)' diff --git a/src/photini/data/googlemap/script.js b/src/photini/data/googlemap/script.js index 0527796d..7ec6598c 100644 --- a/src/photini/data/googlemap/script.js +++ b/src/photini/data/googlemap/script.js @@ -149,6 +149,7 @@ function addMarker(id, lat, lng, active) position: new google.maps.LatLng(lat, lng), map: map, draggable: true, + crossOnDrag: false, }); markers[id] = marker; google.maps.event.addListener(marker, 'click', markerClick); From 78d1f51a790ff5736b534673372e5e54f331de57 Mon Sep 17 00:00:00 2001 From: Jim Easterbrook Date: Wed, 29 Mar 2023 11:51:52 +0100 Subject: [PATCH 03/11] Fix bug when applying ownership template If the photos' dates span more than one year they all got the same copyright year. --- src/photini/__init__.py | 2 +- src/photini/ownership.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/photini/__init__.py b/src/photini/__init__.py index f647c6a0..b1baaad9 100644 --- a/src/photini/__init__.py +++ b/src/photini/__init__.py @@ -1,4 +1,4 @@ """Full documentation is at https://photini.readthedocs.io/""" __version__ = '2023.3.0' -build = '2650 (9a1e1ec)' +build = '2651 (b41f723)' diff --git a/src/photini/ownership.py b/src/photini/ownership.py index b965c0a5..ee9f0c57 100644 --- a/src/photini/ownership.py +++ b/src/photini/ownership.py @@ -437,8 +437,8 @@ def apply_template(self): value = template[key] if isinstance(value, dict): # langalt copyright - for k in value: - value[k] = date_taken.strftime(value[k]) + value = dict((k, date_taken.strftime(v)) + for (k, v) in value.items()) else: value = date_taken.strftime(value) self._set_value(image, key, value) From a2c3241cad4ca6b3398571dfed1c0cb006e2fce6 Mon Sep 17 00:00:00 2001 From: Jim Easterbrook Date: Sat, 1 Apr 2023 11:39:50 +0100 Subject: [PATCH 04/11] Raise minimum version of PyQt Scoped enums were introduced in 5.11, so earlier versions no longer work with Photini. --- src/doc/other/installation.rst | 2 +- src/photini/__init__.py | 4 ++-- src/photini/pyqt.py | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/doc/other/installation.rst b/src/doc/other/installation.rst index f5c6d40e..0a8c74a4 100644 --- a/src/doc/other/installation.rst +++ b/src/doc/other/installation.rst @@ -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 diff --git a/src/photini/__init__.py b/src/photini/__init__.py index b1baaad9..72b7e30f 100644 --- a/src/photini/__init__.py +++ b/src/photini/__init__.py @@ -1,4 +1,4 @@ """Full documentation is at https://photini.readthedocs.io/""" -__version__ = '2023.3.0' -build = '2651 (b41f723)' +__version__ = '2023.4.0' +build = '2652 (78d1f51)' diff --git a/src/photini/pyqt.py b/src/photini/pyqt.py index 3e974091..05391699 100644 --- a/src/photini/pyqt.py +++ b/src/photini/pyqt.py @@ -148,6 +148,12 @@ def import_PyQt5(): map(int, QtCore.QT_VERSION_STR.split('.'))) qt_version = 'PyQt {}, Qt {}'.format( QtCore.PYQT_VERSION_STR, QtCore.QT_VERSION_STR) + pyqt_version_info = namedtuple( + 'pyqt_version_info', ('major', 'minor', 'micro'))._make( + map(int, QtCore.PYQT_VERSION_STR.split('.'))) + if pyqt_version_info < (5, 11): + raise ImportError( + 'PyQt version {}.{}.{} is less than 5.11'.format(*pyqt_version_info)) if qt_version_info < (5, 8): raise ImportError( From 51ce3c6f458f09365ff86d40f70140cf89f8093f Mon Sep 17 00:00:00 2001 From: Jim Easterbrook Date: Thu, 6 Apr 2023 16:46:01 +0100 Subject: [PATCH 05/11] Update Google Map API version selection --- src/photini/__init__.py | 2 +- src/photini/googlemap.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/photini/__init__.py b/src/photini/__init__.py index 72b7e30f..c29b775e 100644 --- a/src/photini/__init__.py +++ b/src/photini/__init__.py @@ -1,4 +1,4 @@ """Full documentation is at https://photini.readthedocs.io/""" __version__ = '2023.4.0' -build = '2652 (78d1f51)' +build = '2653 (a2c3241)' diff --git a/src/photini/googlemap.py b/src/photini/googlemap.py index d3c4a4c7..de923f28 100644 --- a/src/photini/googlemap.py +++ b/src/photini/googlemap.py @@ -101,9 +101,9 @@ def get_geocoder(self): return GoogleGeocoder(parent=self) def get_head(self): - url = 'http://maps.googleapis.com/maps/api/js?callback=initialize&v=3' + url = 'http://maps.googleapis.com/maps/api/js?callback=initialize' if self.app.options.test: - url += '.exp' + url += '&v=beta' url += '&key=' + self.api_key lang, encoding = locale.getdefaultlocale() if lang: From 92a251b1ac106c46740d3e3e91e57c9565038a7d Mon Sep 17 00:00:00 2001 From: Jim Easterbrook Date: Fri, 7 Apr 2023 12:27:04 +0100 Subject: [PATCH 06/11] Remove documentation of Flickr auth workaround Flickr finally fixed the callback URL bug, three years after it was reported. --- src/doc/images/screenshot_151b.png | Bin 27078 -> 0 bytes src/doc/images/screenshot_151c.png | Bin 6381 -> 0 bytes src/doc/manual/flickr.rst | 11 +---------- src/photini/__init__.py | 2 +- 4 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 src/doc/images/screenshot_151b.png delete mode 100644 src/doc/images/screenshot_151c.png diff --git a/src/doc/images/screenshot_151b.png b/src/doc/images/screenshot_151b.png deleted file mode 100644 index 0efdae26852f156b350e16cefd7dd02f5703868e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27078 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 diff --git a/src/doc/manual/flickr.rst b/src/doc/manual/flickr.rst index fc0793aa..7512820a 100644 --- a/src/doc/manual/flickr.rst +++ b/src/doc/manual/flickr.rst @@ -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 diff --git a/src/photini/__init__.py b/src/photini/__init__.py index c29b775e..b01c0f16 100644 --- a/src/photini/__init__.py +++ b/src/photini/__init__.py @@ -1,4 +1,4 @@ """Full documentation is at https://photini.readthedocs.io/""" __version__ = '2023.4.0' -build = '2653 (a2c3241)' +build = '2654 (51ce3c6)' From 49b71e31a2cefc933ff822170a25e0ed2ca5c688 Mon Sep 17 00:00:00 2001 From: Jim Easterbrook Date: Fri, 7 Apr 2023 13:31:30 +0100 Subject: [PATCH 07/11] Add another Xmp type --- src/photini/__init__.py | 2 +- src/photini/exiv2.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/photini/__init__.py b/src/photini/__init__.py index b01c0f16..447577d2 100644 --- a/src/photini/__init__.py +++ b/src/photini/__init__.py @@ -1,4 +1,4 @@ """Full documentation is at https://photini.readthedocs.io/""" __version__ = '2023.4.0' -build = '2654 (51ce3c6)' +build = '2655 (92a251b)' diff --git a/src/photini/exiv2.py b/src/photini/exiv2.py index eafbfc9a..331125a2 100644 --- a/src/photini/exiv2.py +++ b/src/photini/exiv2.py @@ -152,6 +152,7 @@ def __init__(self, path=None, buf=None): 'Xmp.iptc.AltTextAccessibility': exiv2.TypeId.langAlt, 'Xmp.iptc.ExtDescrAccessibility': exiv2.TypeId.langAlt, 'Xmp.iptcExt.ImageRegion': exiv2.TypeId.xmpBag, + 'Iptc4xmpExt:LocationName': exiv2.TypeId.langAlt, 'Iptc4xmpExt:Name': exiv2.TypeId.langAlt, 'Iptc4xmpExt:rCtype': exiv2.TypeId.xmpBag, 'Iptc4xmpExt:rRole': exiv2.TypeId.xmpBag, From 05b94f830910da8b4cc61813feca86691317a438 Mon Sep 17 00:00:00 2001 From: Jim Easterbrook Date: Fri, 7 Apr 2023 13:39:43 +0100 Subject: [PATCH 08/11] Minor tweak of GPS to address conversion --- src/photini/__init__.py | 2 +- src/photini/address.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/photini/__init__.py b/src/photini/__init__.py index 447577d2..ac686d5f 100644 --- a/src/photini/__init__.py +++ b/src/photini/__init__.py @@ -1,4 +1,4 @@ """Full documentation is at https://photini.readthedocs.io/""" __version__ = '2023.4.0' -build = '2655 (92a251b)' +build = '2656 (49b71e3)' diff --git a/src/photini/address.py b/src/photini/address.py index f82c1f86..dd6b0720 100644 --- a/src/photini/address.py +++ b/src/photini/address.py @@ -134,7 +134,7 @@ def get_address(self, coords): del address[key_1] break # attempt to format postcode correctly - for key in 'city', 'state', 'country': + for key in 'town', 'city', 'state', 'country': if 'postcode' in address and key in address: for fmt in '{0} {1}', '{0}, {1}', '{1} {0}', '{1}, {0}': guess = fmt.format(address['postcode'], address[key]) From 734002fcf5aad4af86df0dcb0157d9c3eb0375a1 Mon Sep 17 00:00:00 2001 From: Jim Easterbrook Date: Sat, 8 Apr 2023 12:02:59 +0100 Subject: [PATCH 09/11] Another tweak of GPS to address conversion --- src/photini/__init__.py | 2 +- src/photini/address.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/photini/__init__.py b/src/photini/__init__.py index ac686d5f..3ef082d2 100644 --- a/src/photini/__init__.py +++ b/src/photini/__init__.py @@ -1,4 +1,4 @@ """Full documentation is at https://photini.readthedocs.io/""" __version__ = '2023.4.0' -build = '2656 (49b71e3)' +build = '2657 (05b94f8)' diff --git a/src/photini/address.py b/src/photini/address.py index dd6b0720..0268f352 100644 --- a/src/photini/address.py +++ b/src/photini/address.py @@ -134,7 +134,7 @@ def get_address(self, coords): del address[key_1] break # attempt to format postcode correctly - for key in 'town', 'city', 'state', 'country': + for key in 'city', 'town', 'village', 'suburb', 'state', 'country': if 'postcode' in address and key in address: for fmt in '{0} {1}', '{0}, {1}', '{1} {0}', '{1}, {0}': guess = fmt.format(address['postcode'], address[key]) From 40b4c1ef9279a4e66f67cf7d511119572620c386 Mon Sep 17 00:00:00 2001 From: Jim Easterbrook Date: Sat, 8 Apr 2023 12:04:05 +0100 Subject: [PATCH 10/11] Rotate map API keys --- src/photini/__init__.py | 2 +- src/photini/data/keys.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/photini/__init__.py b/src/photini/__init__.py index 3ef082d2..ed812065 100644 --- a/src/photini/__init__.py +++ b/src/photini/__init__.py @@ -1,4 +1,4 @@ """Full documentation is at https://photini.readthedocs.io/""" __version__ = '2023.4.0' -build = '2657 (05b94f8)' +build = '2658 (734002f)' diff --git a/src/photini/data/keys.txt b/src/photini/data/keys.txt index 1cc50c07..8debc9eb 100644 --- a/src/photini/data/keys.txt +++ b/src/photini/data/keys.txt @@ -29,16 +29,16 @@ client_id = OTkxMTQ2MzkyMzc1LWdyOXRjcTc1NWZvbXRqNGUxazQ5NzNmM2FjbWlvN29tLmFwcHMu client_secret = dnkwV3UtYWVmMmlYeTJXZ2lVaUZDOFlB [googlemap] -api_key = QUl6YVN5RGxpMHhubHd3Y0JPNGJtaThLZGwxcDZ5R2JjcHUtTjQ0 +api_key = QUl6YVN5Q2NISHlUa0FxRzRTZ0tmTmZDOEpaN2JDckNrMkVOdi04 [bingmap] -api_key = QWo0bHZta1RjNHdJSlkweWJhSklSSnJoZXdMdk1wZXJjUWlraWJGTDRZaDRKVHFaS1ZfTGRIMndnYm5yczFLeQ== +api_key = QWdUaFUwT2R5ZVNtTHdjMVZzUm9kLVZrRVhic0tPTlQtaWNhdzJFQWhXMXZjaEdkM19SRXdtWXZfRkp3SzhaVw== [opencage] api_key = YWE3YjIwMTE3ZTBkNGE4NDk4NzQzMTc3MTI0NmY1NjU= [mapboxmap] -api_key = cGsuZXlKMUlqb2lhbWx0TFdWaGMzUmxjbUp5YjI5cklpd2lZU0k2SW1Oc1lUZzNPSHBqT1RBd2VUSXpibTUyTTI5cmNXczRiMllpZlEudW14YnF6bVV2OU5PX2hQcGtZMEx1Zw== +api_key = cGsuZXlKMUlqb2lhbWx0TFdWaGMzUmxjbUp5YjI5cklpd2lZU0k2SW1Oc1p6ZHhaR0ZyWkRCdE5Ya3pjM0Y1Y2poM2JYZDNaemtpZlEuUGloRzRqNXJsNVJmUVN3MjF3VzVYUQ== [pixelfed pixelfed.de] client_id = NDIyNjQ= From ac977a5d218581e23f788779f6ee0b0bc8cdcbe6 Mon Sep 17 00:00:00 2001 From: Jim Easterbrook Date: Mon, 10 Apr 2023 10:12:49 +0100 Subject: [PATCH 11/11] Update translation source --- src/lang/ca/LC_MESSAGES/index.po | 2 +- src/lang/ca/LC_MESSAGES/manual.po | 33 ++++++++++++++--------- src/lang/ca/LC_MESSAGES/misc.po | 2 +- src/lang/ca/LC_MESSAGES/other.po | 7 +++-- src/lang/cs/LC_MESSAGES/index.po | 2 +- src/lang/cs/LC_MESSAGES/manual.po | 33 ++++++++++++++--------- src/lang/cs/LC_MESSAGES/misc.po | 2 +- src/lang/cs/LC_MESSAGES/other.po | 10 ++++--- src/lang/de/LC_MESSAGES/index.po | 2 +- src/lang/de/LC_MESSAGES/manual.po | 33 ++++++++++++++--------- src/lang/de/LC_MESSAGES/misc.po | 2 +- src/lang/de/LC_MESSAGES/other.po | 7 +++-- src/lang/es/LC_MESSAGES/index.po | 2 +- src/lang/es/LC_MESSAGES/manual.po | 33 ++++++++++++++--------- src/lang/es/LC_MESSAGES/misc.po | 2 +- src/lang/es/LC_MESSAGES/other.po | 7 +++-- src/lang/fr/LC_MESSAGES/index.po | 2 +- src/lang/fr/LC_MESSAGES/manual.po | 33 ++++++++++++++--------- src/lang/fr/LC_MESSAGES/misc.po | 2 +- src/lang/fr/LC_MESSAGES/other.po | 7 +++-- src/lang/it/LC_MESSAGES/index.po | 2 +- src/lang/it/LC_MESSAGES/manual.po | 33 ++++++++++++++--------- src/lang/it/LC_MESSAGES/misc.po | 2 +- src/lang/it/LC_MESSAGES/other.po | 7 +++-- src/lang/ko/LC_MESSAGES/index.po | 2 +- src/lang/ko/LC_MESSAGES/manual.po | 39 +++++++++++++++++---------- src/lang/ko/LC_MESSAGES/misc.po | 2 +- src/lang/ko/LC_MESSAGES/other.po | 10 ++++--- src/lang/nb/LC_MESSAGES/index.po | 2 +- src/lang/nb/LC_MESSAGES/manual.po | 33 ++++++++++++++--------- src/lang/nb/LC_MESSAGES/misc.po | 2 +- src/lang/nb/LC_MESSAGES/other.po | 7 +++-- src/lang/pl/LC_MESSAGES/index.po | 2 +- src/lang/pl/LC_MESSAGES/manual.po | 33 ++++++++++++++--------- src/lang/pl/LC_MESSAGES/misc.po | 2 +- src/lang/pl/LC_MESSAGES/other.po | 7 +++-- src/lang/templates/gettext/index.pot | 4 +-- src/lang/templates/gettext/manual.pot | 12 +++------ src/lang/templates/gettext/misc.pot | 4 +-- src/lang/templates/gettext/other.pot | 6 ++--- 40 files changed, 270 insertions(+), 164 deletions(-) diff --git a/src/lang/ca/LC_MESSAGES/index.po b/src/lang/ca/LC_MESSAGES/index.po index b09036de..8717317d 100644 --- a/src/lang/ca/LC_MESSAGES/index.po +++ b/src/lang/ca/LC_MESSAGES/index.po @@ -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 , 2022\n" "Language: ca\n" diff --git a/src/lang/ca/LC_MESSAGES/manual.po b/src/lang/ca/LC_MESSAGES/manual.po index 2df62856..06a6cbff 100644 --- a/src/lang/ca/LC_MESSAGES/manual.po +++ b/src/lang/ca/LC_MESSAGES/manual.po @@ -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 , 2022\n" "Language: ca\n" @@ -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 "" @@ -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 "" + diff --git a/src/lang/ca/LC_MESSAGES/misc.po b/src/lang/ca/LC_MESSAGES/misc.po index d45fb42e..6b2af3e7 100644 --- a/src/lang/ca/LC_MESSAGES/misc.po +++ b/src/lang/ca/LC_MESSAGES/misc.po @@ -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 , 2022\n" "Language: ca\n" diff --git a/src/lang/ca/LC_MESSAGES/other.po b/src/lang/ca/LC_MESSAGES/other.po index 54cd1fd8..9cf6a046 100644 --- a/src/lang/ca/LC_MESSAGES/other.po +++ b/src/lang/ca/LC_MESSAGES/other.po @@ -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 \n" "Language: ca\n" @@ -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``" @@ -3023,3 +3023,6 @@ msgstr "" #~ msgid "0.13.2" #~ msgstr "" +#~ msgid "5.9" +#~ msgstr "" + diff --git a/src/lang/cs/LC_MESSAGES/index.po b/src/lang/cs/LC_MESSAGES/index.po index 6bb3e163..b8127fb4 100644 --- a/src/lang/cs/LC_MESSAGES/index.po +++ b/src/lang/cs/LC_MESSAGES/index.po @@ -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" diff --git a/src/lang/cs/LC_MESSAGES/manual.po b/src/lang/cs/LC_MESSAGES/manual.po index bceafa6f..3d667012 100644 --- a/src/lang/cs/LC_MESSAGES/manual.po +++ b/src/lang/cs/LC_MESSAGES/manual.po @@ -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 , 2022\n" "Language: cs\n" @@ -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 "" @@ -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 "" + diff --git a/src/lang/cs/LC_MESSAGES/misc.po b/src/lang/cs/LC_MESSAGES/misc.po index 8ba69c8b..3fc3d8d7 100644 --- a/src/lang/cs/LC_MESSAGES/misc.po +++ b/src/lang/cs/LC_MESSAGES/misc.po @@ -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 , 2023\n" "Language: cs\n" diff --git a/src/lang/cs/LC_MESSAGES/other.po b/src/lang/cs/LC_MESSAGES/other.po index 9a44fb16..0785fed5 100644 --- a/src/lang/cs/LC_MESSAGES/other.po +++ b/src/lang/cs/LC_MESSAGES/other.po @@ -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" @@ -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``" @@ -1724,3 +1725,6 @@ msgstr "" #~ msgid "0.13.2" #~ msgstr "0.11.0" +#~ msgid "5.9" +#~ msgstr "5.9" + diff --git a/src/lang/de/LC_MESSAGES/index.po b/src/lang/de/LC_MESSAGES/index.po index 67856ad7..82a7f18a 100644 --- a/src/lang/de/LC_MESSAGES/index.po +++ b/src/lang/de/LC_MESSAGES/index.po @@ -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 , 2022\n" "Language: de\n" diff --git a/src/lang/de/LC_MESSAGES/manual.po b/src/lang/de/LC_MESSAGES/manual.po index 4f59027b..d169b9f5 100644 --- a/src/lang/de/LC_MESSAGES/manual.po +++ b/src/lang/de/LC_MESSAGES/manual.po @@ -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 , 2022\n" "Language: de\n" @@ -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 "" @@ -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 "" + diff --git a/src/lang/de/LC_MESSAGES/misc.po b/src/lang/de/LC_MESSAGES/misc.po index d3dab55a..e91ea77a 100644 --- a/src/lang/de/LC_MESSAGES/misc.po +++ b/src/lang/de/LC_MESSAGES/misc.po @@ -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 , 2022\n" "Language: de\n" diff --git a/src/lang/de/LC_MESSAGES/other.po b/src/lang/de/LC_MESSAGES/other.po index 1f137630..763ac904 100644 --- a/src/lang/de/LC_MESSAGES/other.po +++ b/src/lang/de/LC_MESSAGES/other.po @@ -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 , 2022\n" "Language: de\n" @@ -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``" @@ -1714,3 +1714,6 @@ msgstr "" #~ msgid "0.13.2" #~ msgstr "" +#~ msgid "5.9" +#~ msgstr "" + diff --git a/src/lang/es/LC_MESSAGES/index.po b/src/lang/es/LC_MESSAGES/index.po index 921d289e..3c85bdd8 100644 --- a/src/lang/es/LC_MESSAGES/index.po +++ b/src/lang/es/LC_MESSAGES/index.po @@ -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 , 2022\n" "Language: es\n" diff --git a/src/lang/es/LC_MESSAGES/manual.po b/src/lang/es/LC_MESSAGES/manual.po index bd22cb6a..a4cf7bef 100644 --- a/src/lang/es/LC_MESSAGES/manual.po +++ b/src/lang/es/LC_MESSAGES/manual.po @@ -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 , 2022\n" "Language: es\n" @@ -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 "" @@ -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 "" + diff --git a/src/lang/es/LC_MESSAGES/misc.po b/src/lang/es/LC_MESSAGES/misc.po index a1389e19..8af89c84 100644 --- a/src/lang/es/LC_MESSAGES/misc.po +++ b/src/lang/es/LC_MESSAGES/misc.po @@ -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 \n" "Language: es\n" diff --git a/src/lang/es/LC_MESSAGES/other.po b/src/lang/es/LC_MESSAGES/other.po index c8e96646..0b9e2d36 100644 --- a/src/lang/es/LC_MESSAGES/other.po +++ b/src/lang/es/LC_MESSAGES/other.po @@ -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 \n" "Language: es\n" @@ -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``" @@ -3021,3 +3021,6 @@ msgstr "" #~ msgid "0.13.2" #~ msgstr "" +#~ msgid "5.9" +#~ msgstr "" + diff --git a/src/lang/fr/LC_MESSAGES/index.po b/src/lang/fr/LC_MESSAGES/index.po index c8fe2541..e8794c78 100644 --- a/src/lang/fr/LC_MESSAGES/index.po +++ b/src/lang/fr/LC_MESSAGES/index.po @@ -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 , 2022\n" "Language: fr\n" diff --git a/src/lang/fr/LC_MESSAGES/manual.po b/src/lang/fr/LC_MESSAGES/manual.po index 45a185d7..fb60250b 100644 --- a/src/lang/fr/LC_MESSAGES/manual.po +++ b/src/lang/fr/LC_MESSAGES/manual.po @@ -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 , 2022\n" "Language: fr\n" @@ -571,17 +571,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 "" @@ -2468,3 +2459,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 "" + diff --git a/src/lang/fr/LC_MESSAGES/misc.po b/src/lang/fr/LC_MESSAGES/misc.po index 8bab42ac..5805bf71 100644 --- a/src/lang/fr/LC_MESSAGES/misc.po +++ b/src/lang/fr/LC_MESSAGES/misc.po @@ -7,7 +7,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-27 13:50+0100\n" "Last-Translator: FULL NAME \n" "Language: fr\n" diff --git a/src/lang/fr/LC_MESSAGES/other.po b/src/lang/fr/LC_MESSAGES/other.po index a24afc31..247c4e51 100644 --- a/src/lang/fr/LC_MESSAGES/other.po +++ b/src/lang/fr/LC_MESSAGES/other.po @@ -7,7 +7,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-27 13:50+0100\n" "Last-Translator: FULL NAME \n" "Language: fr\n" @@ -314,7 +314,7 @@ msgstr "" msgid "PyQt_ [1]" msgstr "" -msgid "5.9" +msgid "5.11" msgstr "" msgid "``python3-qt5`` or ``python3-pyqt5`` or ``python310-PyQt6``" @@ -1790,3 +1790,6 @@ msgstr "" #~ msgid "0.13.2" #~ msgstr "" +#~ msgid "5.9" +#~ msgstr "" + diff --git a/src/lang/it/LC_MESSAGES/index.po b/src/lang/it/LC_MESSAGES/index.po index 2e4b3c47..4da8947a 100644 --- a/src/lang/it/LC_MESSAGES/index.po +++ b/src/lang/it/LC_MESSAGES/index.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Photini 2023.3.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-03-27 10:13+0100\n" "Last-Translator: FULL NAME \n" "Language: it\n" diff --git a/src/lang/it/LC_MESSAGES/manual.po b/src/lang/it/LC_MESSAGES/manual.po index 6d415731..e877a33f 100644 --- a/src/lang/it/LC_MESSAGES/manual.po +++ b/src/lang/it/LC_MESSAGES/manual.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Photini 2023.3.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-03-27 10:13+0100\n" "Last-Translator: FULL NAME \n" "Language: it\n" @@ -566,17 +566,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 "" @@ -2398,3 +2389,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 "" + diff --git a/src/lang/it/LC_MESSAGES/misc.po b/src/lang/it/LC_MESSAGES/misc.po index b17f4aa0..186504de 100644 --- a/src/lang/it/LC_MESSAGES/misc.po +++ b/src/lang/it/LC_MESSAGES/misc.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Photini 2023.3.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-03-27 10:13+0100\n" "Last-Translator: FULL NAME \n" "Language: it\n" diff --git a/src/lang/it/LC_MESSAGES/other.po b/src/lang/it/LC_MESSAGES/other.po index 41bf39e0..22fd75e3 100644 --- a/src/lang/it/LC_MESSAGES/other.po +++ b/src/lang/it/LC_MESSAGES/other.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Photini 2023.3.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-03-27 10:13+0100\n" "Last-Translator: FULL NAME \n" "Language: it\n" @@ -314,7 +314,7 @@ msgstr "" msgid "PyQt_ [1]" msgstr "" -msgid "5.9" +msgid "5.11" msgstr "" msgid "``python3-qt5`` or ``python3-pyqt5`` or ``python310-PyQt6``" @@ -1337,3 +1337,6 @@ msgstr "" #~ msgid "0.13.2" #~ msgstr "" +#~ msgid "5.9" +#~ msgstr "" + diff --git a/src/lang/ko/LC_MESSAGES/index.po b/src/lang/ko/LC_MESSAGES/index.po index c7bae461..2eb0ce59 100644 --- a/src/lang/ko/LC_MESSAGES/index.po +++ b/src/lang/ko/LC_MESSAGES/index.po @@ -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-30 12:10+0000\n" "Last-Translator: Soohyeon Park, 2022\n" "Language: ko\n" diff --git a/src/lang/ko/LC_MESSAGES/manual.po b/src/lang/ko/LC_MESSAGES/manual.po index 107edb8e..7b2ee6a7 100644 --- a/src/lang/ko/LC_MESSAGES/manual.po +++ b/src/lang/ko/LC_MESSAGES/manual.po @@ -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: Jim Easterbrook , 2022\n" "Language: ko\n" @@ -728,20 +728,9 @@ 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.)" +"After authorisation your browser should display this page. The web browser " +"window can then be closed." msgstr "" -"2020년 1월 Flickr는 인증 프로세스에 버그를 도입했습니다. \"콜백 URL\"을 HTTP에서 HTTPS로 변경하므로 위와 같은 " -"오류가 발생합니다. (다른 브라우저에서는 다른 오류가 표시될 수 있습니다.)" - -msgid "" -"The workaround is to click on the browser's URL display, change \"https\" to" -" \"http\", then hit the return key." -msgstr "해결 방법은 브라우저의 URL 표시를 클릭하고 \"https\"를 \"http\"로 변경한 다음 리턴 키를 누르는 것입니다." - -msgid "The web browser window can then be closed." -msgstr "그런 다음 웹 브라우저 창을 닫을 수 있습니다." msgid "" "If the authorisation is successful Photini displays your Flickr user name " @@ -2924,3 +2913,25 @@ msgstr "The :doc:`flickr` 탭은 비디오 파일을 업로드할 수 있지만 #~ msgid "Xmp.aux.SerialNumber" #~ msgstr "Xmp.aux.SerialNumber" +#~ 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 "" +#~ "2020년 1월 Flickr는 인증 프로세스에 버그를 도입했습니다." +#~ " \"콜백 URL\"을 HTTP에서 HTTPS로 변경하므로 위와 " +#~ "같은 오류가 발생합니다. (다른 브라우저에서는 다른 오류가 " +#~ "표시될 수 있습니다.)" + +#~ msgid "" +#~ "The workaround is to click on the " +#~ "browser's URL display, change \"https\" to" +#~ " \"http\", then hit the return key." +#~ msgstr "해결 방법은 브라우저의 URL 표시를 클릭하고 \"https\"를 \"http\"로 변경한 다음 리턴 키를 누르는 것입니다." + +#~ msgid "The web browser window can then be closed." +#~ msgstr "그런 다음 웹 브라우저 창을 닫을 수 있습니다." + diff --git a/src/lang/ko/LC_MESSAGES/misc.po b/src/lang/ko/LC_MESSAGES/misc.po index cac8b411..6c8d4f6d 100644 --- a/src/lang/ko/LC_MESSAGES/misc.po +++ b/src/lang/ko/LC_MESSAGES/misc.po @@ -11,7 +11,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: Soohyeon Park, 2023\n" "Language: ko\n" diff --git a/src/lang/ko/LC_MESSAGES/other.po b/src/lang/ko/LC_MESSAGES/other.po index 52c3f814..c6ddf51b 100644 --- a/src/lang/ko/LC_MESSAGES/other.po +++ b/src/lang/ko/LC_MESSAGES/other.po @@ -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: Jim Easterbrook , 2022\n" "Language: ko\n" @@ -360,8 +360,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``" @@ -1909,3 +1910,6 @@ msgstr "" #~ msgid "0.13.2" #~ msgstr "0.11.0" +#~ msgid "5.9" +#~ msgstr "5.9" + diff --git a/src/lang/nb/LC_MESSAGES/index.po b/src/lang/nb/LC_MESSAGES/index.po index f1b5152f..e98c09aa 100644 --- a/src/lang/nb/LC_MESSAGES/index.po +++ b/src/lang/nb/LC_MESSAGES/index.po @@ -7,7 +7,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 10:57+0100\n" "Last-Translator: FULL NAME \n" "Language: nb\n" diff --git a/src/lang/nb/LC_MESSAGES/manual.po b/src/lang/nb/LC_MESSAGES/manual.po index 5db0ee40..08f63622 100644 --- a/src/lang/nb/LC_MESSAGES/manual.po +++ b/src/lang/nb/LC_MESSAGES/manual.po @@ -7,7 +7,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 10:57+0100\n" "Last-Translator: FULL NAME \n" "Language: nb\n" @@ -566,17 +566,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 "" @@ -2463,3 +2454,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 "" + diff --git a/src/lang/nb/LC_MESSAGES/misc.po b/src/lang/nb/LC_MESSAGES/misc.po index f757aa50..fe3f288a 100644 --- a/src/lang/nb/LC_MESSAGES/misc.po +++ b/src/lang/nb/LC_MESSAGES/misc.po @@ -7,7 +7,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 10:57+0100\n" "Last-Translator: FULL NAME \n" "Language: nb\n" diff --git a/src/lang/nb/LC_MESSAGES/other.po b/src/lang/nb/LC_MESSAGES/other.po index 1c1f58ba..90e2d8e6 100644 --- a/src/lang/nb/LC_MESSAGES/other.po +++ b/src/lang/nb/LC_MESSAGES/other.po @@ -7,7 +7,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 10:57+0100\n" "Last-Translator: FULL NAME \n" "Language: nb\n" @@ -314,7 +314,7 @@ msgstr "" msgid "PyQt_ [1]" msgstr "" -msgid "5.9" +msgid "5.11" msgstr "" msgid "``python3-qt5`` or ``python3-pyqt5`` or ``python310-PyQt6``" @@ -1710,3 +1710,6 @@ msgstr "" #~ msgid "0.13.2" #~ msgstr "" +#~ msgid "5.9" +#~ msgstr "" + diff --git a/src/lang/pl/LC_MESSAGES/index.po b/src/lang/pl/LC_MESSAGES/index.po index 72e80549..242d394a 100644 --- a/src/lang/pl/LC_MESSAGES/index.po +++ b/src/lang/pl/LC_MESSAGES/index.po @@ -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: Dawid Głaz, 2022\n" "Language: pl\n" diff --git a/src/lang/pl/LC_MESSAGES/manual.po b/src/lang/pl/LC_MESSAGES/manual.po index d8811903..ad95c7fe 100644 --- a/src/lang/pl/LC_MESSAGES/manual.po +++ b/src/lang/pl/LC_MESSAGES/manual.po @@ -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: Jim Easterbrook , 2022\n" "Language: pl\n" @@ -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 "" @@ -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 "" + diff --git a/src/lang/pl/LC_MESSAGES/misc.po b/src/lang/pl/LC_MESSAGES/misc.po index d5b74d44..041c75ba 100644 --- a/src/lang/pl/LC_MESSAGES/misc.po +++ b/src/lang/pl/LC_MESSAGES/misc.po @@ -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 \n" "Language: pl\n" diff --git a/src/lang/pl/LC_MESSAGES/other.po b/src/lang/pl/LC_MESSAGES/other.po index 15b164ea..096259ce 100644 --- a/src/lang/pl/LC_MESSAGES/other.po +++ b/src/lang/pl/LC_MESSAGES/other.po @@ -8,7 +8,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 \n" "Language: pl\n" @@ -333,7 +333,7 @@ msgstr "" msgid "PyQt_ [1]" msgstr "" -msgid "5.9" +msgid "5.11" msgstr "" msgid "``python3-qt5`` or ``python3-pyqt5`` or ``python310-PyQt6``" @@ -3033,3 +3033,6 @@ msgstr "" #~ msgid "0.13.2" #~ msgstr "" +#~ msgid "5.9" +#~ msgstr "" + diff --git a/src/lang/templates/gettext/index.pot b/src/lang/templates/gettext/index.pot index 2a9cf7a5..4c484934 100644 --- a/src/lang/templates/gettext/index.pot +++ b/src/lang/templates/gettext/index.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Photini 2023.3.0\n" +"Project-Id-Version: Photini 2023.4.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: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/lang/templates/gettext/manual.pot b/src/lang/templates/gettext/manual.pot index c38ab091..72406798 100644 --- a/src/lang/templates/gettext/manual.pot +++ b/src/lang/templates/gettext/manual.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Photini 2023.3.0\n" +"Project-Id-Version: Photini 2023.4.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: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -292,13 +292,7 @@ msgstr "" msgid "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.)" 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." +msgid "After authorisation your browser should display this page. The web browser window can then be closed." msgstr "" msgid "If the authorisation is successful Photini displays your Flickr user name and profile picture. You should not need to redo this authorisation process unless you click the ``Log out`` button." diff --git a/src/lang/templates/gettext/misc.pot b/src/lang/templates/gettext/misc.pot index b55130e1..7e27b7df 100644 --- a/src/lang/templates/gettext/misc.pot +++ b/src/lang/templates/gettext/misc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Photini 2023.3.0\n" +"Project-Id-Version: Photini 2023.4.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: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/lang/templates/gettext/other.pot b/src/lang/templates/gettext/other.pot index 6bd06bcb..042f2288 100644 --- a/src/lang/templates/gettext/other.pot +++ b/src/lang/templates/gettext/other.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Photini 2023.3.0\n" +"Project-Id-Version: Photini 2023.4.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: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -202,7 +202,7 @@ msgstr "" msgid "PyQt_ [1]" msgstr "" -msgid "5.9" +msgid "5.11" msgstr "" msgid "``python3-qt5`` or ``python3-pyqt5`` or ``python310-PyQt6``"