From 12d858041b6a548b80e4d2d8d14ea7bf9539c3f5 Mon Sep 17 00:00:00 2001 From: Jim Easterbrook Date: Thu, 12 Sep 2024 19:55:27 +0100 Subject: [PATCH 1/3] Add 'lrelease' to possible tool names --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bd82ed03..f2e40165 100644 --- a/setup.py +++ b/setup.py @@ -79,7 +79,8 @@ def finalize_options(self): def run(self): self.announce('running build_lang') - self.tools = ['lrelease6', 'pyside6-lrelease', 'lrelease-qt5'] + self.tools = ['lrelease', 'lrelease6', 'pyside6-lrelease', + 'lrelease-qt5'] self.mkpath(self.output_dir) self.mkpath(self.build_temp) numerus_count = {'cs': 3, 'es': 2, 'fr': 2, 'it': 2, 'pl': 3} From 6d17c78a8f5e3caf900f77570c752a3ea6f721f5 Mon Sep 17 00:00:00 2001 From: Jim Easterbrook Date: Fri, 13 Sep 2024 10:28:02 +0100 Subject: [PATCH 2/3] Improved translator loading Allow Qt to find a matching translation file using its own logic. --- src/photini/editor.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/photini/editor.py b/src/photini/editor.py index 0dd7ac4c..db350edc 100644 --- a/src/photini/editor.py +++ b/src/photini/editor.py @@ -590,17 +590,18 @@ def main(argv=None): if 'en' not in langs: langs += ['en'] installed = [] - for lang in reversed(langs): - if lang in installed: - continue - file = os.path.join(lang_dir, 'photini.{}.qm'.format(lang)) - if not os.path.isfile(file): - file = os.path.join(lang_dir, 'photini.{}.qm'.format(lang.lower())) + # create translators in language preference order + translators = [] + for lang in langs: translator = QtCore.QTranslator() - if os.path.isfile(file) and translator.load(file): - translator.setParent(app) - app.installTranslator(translator) - installed.append(lang) + if (translator.load('photini.' + lang, lang_dir) + and translator.language() + not in [x.language() for x in translators]): + translators.append(translator) + # load translators in reverse order, so preferred language is used first + for translator in reversed(translators): + translator.setParent(app) + app.installTranslator(translator) # parse remaining arguments version = full_version_info() parser = OptionParser( From bca2e946ae6fa2ebabf16782196228fcb88f615b Mon Sep 17 00:00:00 2001 From: Jim Easterbrook Date: Fri, 13 Sep 2024 10:47:18 +0100 Subject: [PATCH 3/3] Update installation documentation --- src/doc/other/installation.rst | 781 +++++++++---------- src/lang/ca/LC_MESSAGES/documentation.po | 368 +++++++-- src/lang/cs/LC_MESSAGES/documentation.po | 360 +++++++-- src/lang/de/LC_MESSAGES/documentation.po | 372 +++++++-- src/lang/es/LC_MESSAGES/documentation.po | 368 +++++++-- src/lang/fr/LC_MESSAGES/documentation.po | 368 +++++++-- src/lang/it/LC_MESSAGES/documentation.po | 368 +++++++-- src/lang/ko/LC_MESSAGES/documentation.po | 331 ++++++-- src/lang/nb/LC_MESSAGES/documentation.po | 368 +++++++-- src/lang/pl/LC_MESSAGES/documentation.po | 368 +++++++-- src/lang/templates/gettext/documentation.pot | 97 ++- 11 files changed, 3111 insertions(+), 1038 deletions(-) diff --git a/src/doc/other/installation.rst b/src/doc/other/installation.rst index d27adbb9..c9810f7d 100644 --- a/src/doc/other/installation.rst +++ b/src/doc/other/installation.rst @@ -24,40 +24,30 @@ It is already installed on many computers, but on Windows you will probably need Python should already be installed, but make sure you have Python |nbsp| 3. Open a terminal window and run the ``python3`` command:: - jim@mint:~$ python3 -V - Python 3.8.10 + jim@mint22:~$ python3 -V + Python 3.12.3 Note that the command is ``python3``. - On many machines the ``python`` command still runs Python |nbsp| 2. + On some machines the ``python`` command still runs Python |nbsp| 2. If you do not have Python |nbsp| 3 installed then use your operating system's package manager to install it. You should also check what version of pip_ is installed:: - jim@mint:~$ pip3 --version - pip 20.0.2 from /usr/lib/python3/dist-packages/pip (python 3.8) - - Most Linux systems suppress pip's normal version check, but I recommend upgrading pip anyway:: - - jim@mint:~$ python3 -m pip install -U pip - Collecting pip - Downloading pip-23.1.2-py3-none-any.whl (2.1 MB) - |████████████████████████████████| 2.1 MB 755 kB/s - Installing collected packages: pip - WARNING: The scripts pip, pip3, pip3.10 and pip3.8 are installed in '/home/jim/.local/bin' which is not on PATH. - Consider adding this directory to PATH or, if you prefer to suppress this warning, use --no-warn-script-location. - Successfully installed pip-23.1.2 - - Note that pip has installed the new version in ``/home/jim/.local`` as normal users can't write to ``/usr``. - (Don't be tempted to get round this by using ``sudo`` to run pip. - ``/usr/lib/python3/dist-packages`` should only be written by the operating system's package manager.) - You may need to log out and then log in again to update your PATH settings. - (On some Linux distributions you can simply run ``source ~/.profile`` instead of logging out & in.) - - Running ``pip --version`` again shows the new version:: - - jim@mint:~$ pip --version - pip 23.1.2 from /home/jim/.local/lib/python3.8/site-packages/pip (python 3.8) + jim@mint22:~$ pip3 show pip + Name: pip + Version: 24.0 + Summary: The PyPA recommended tool for installing Python packages. + Home-page: + Author: + Author-email: The pip developers + License: MIT + Location: /usr/lib/python3/dist-packages + Requires: + Required-by: + Although pip_ is a Python package manager it should not be used to install packges under ``/usr/lib/``. + This system directory should only be used by the operating system's package manager. + With recent Python and pip versions you have to use a virtual environment to install other packages such as Photini. .. group-tab:: Windows @@ -117,7 +107,7 @@ It is already installed on many computers, but on Windows you will probably need If you install packages with ``pip`` as a normal user (i.e. without administrator privileges) it will put them under your "roaming" application data directory, e.g. ``c:\users\jim\appdata\roaming\python\python38\site-packages``. I think this is a curious choice of location and strongly recommend using a "virtual environment" to install Photini and its dependencies in your choice of location. - + The following instructions assume a virtual environment is in use and activated. If you don't use a virtual environment then replace ``python`` with ``py`` and ``pip`` with ``py -m pip``. @@ -126,11 +116,12 @@ Installing Photini Before installing Photini you need to decide if you are installing it for a single user or for multiple users. Multi-user installations use a Python `virtual environment`_ to create a self contained installation that can easily be shared. -Using a virtual environment has other advantages, such as easy uninstallation, so I recommend using it for a single user installation. +Using a virtual environment has other advantages, such as easy uninstallation, so I also recommend using it for a single user installation. Linux & MacOS users have another decision to make - whether to install Photini's dependencies with pip_ or with the operating system's package manager. For a good introduction to the advantages and disadvantages of each I suggest reading `Managing Python packages the right way`_. All of Photini's dependencies can be installed with pip_, but I recommend installing PySide6 / PySide2 / PyQt6 / PyQt5 (whichever is available) with the package manager to ensure you install all of its system libraries and plugins, and so that you get the same GUI style as other Qt based applications. +(Don't forget to install the QtWebEngine stuff as well if it's in a seaprate package.) Virtual environment ^^^^^^^^^^^^^^^^^^^ @@ -144,20 +135,22 @@ I use the name ``photini`` and create it in my home directory: :: - jim@mint:~$ python3 -m venv photini --system-site-packages - jim@mint:~$ source photini/bin/activate - (photini) jim@mint:~$ python3 -m pip install -U pip + jim@mint22:~$ python3 -m venv photini --system-site-packages + jim@mint22:~$ source photini/bin/activate + (photini) jim@mint22:~$ python -m pip install -U pip + Requirement already satisfied: pip in ./photini/lib/python3.12/site-packages (24.0) Collecting pip - Using cached pip-23.1.2-py3-none-any.whl (2.1 MB) + Downloading pip-24.2-py3-none-any.whl.metadata (3.6 kB) + Downloading pip-24.2-py3-none-any.whl (1.8 MB) + ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 1.8/1.8 MB 694.4 kB/s eta 0:00:00 Installing collected packages: pip Attempting uninstall: pip - Found existing installation: pip 20.0.2 - Uninstalling pip-20.0.2: - Successfully uninstalled pip-20.0.2 - Successfully installed pip-23.1.2 + Found existing installation: pip 24.0 + Uninstalling pip-24.0: + Successfully uninstalled pip-24.0 + Successfully installed pip-24.2 - The option ``--system-site-packages`` makes packages installed with the system package manager (e.g. PySide6 / PySide2 / PyQt6 / PyQt5) available within the virtual environment. - Note that pip may need to be updated again from within the virtual environment. + The option ``--system-site-packages`` makes packages installed with the system package manager (e.g. PyQt6) available within the virtual environment. .. group-tab:: Windows @@ -179,12 +172,11 @@ I use the name ``photini`` and create it in my home directory: Successfully uninstalled pip-21.1.1 Successfully installed pip-24.2 - (photini) C:\Users\Jim> - Note that after activating the virtual environment the ``py`` command is not needed. Python, pip, and other Python based commands are run directly. - After creating the virtual environment you should update ``pip`` as shown above. - This ensures that the latest version will be used to install Photini. + +After creating the virtual environment you should update ``pip`` as shown above. +This ensures that the latest version will be used to install Photini. You should stay in this virtual environment while installing and testing Photini. After that Photini can be run without activating the virtual environment. @@ -198,170 +190,147 @@ Hence there are four Python Qt packages - PyQt5, PyQt6, PySide2, and PySide6. Photini works with any one of these, but there isn't one of them that works on all platforms. For example, Qt6 does not work on Windows versions earlier than Windows |nbsp| 10. -After installing Photini the ``photini-configure`` command can be used to choose a Qt package. +I recommend PyQt rather than PySide, and Qt6 rather than Qt5. +However, if your operating system already has one of the packages installed then there's probably no reason to use any other. + +If you install more than one Qt package you can choose which one Photini uses in its :doc:`configuration <../manual/configuration>`. This allows you to try each until you find one that works satisfactorily on your computer. +"Extras" +^^^^^^^^ + +Photini has a number of optional extras that can be installed with pip_. +These are: + +* flickr: Enable uploading pictures to Flickr_. +* google: Enable uploading pictures to `Google Photos`_. +* ipernity: Enable uploading pictures to Ipernity_. +* pixelfed: Enable uploading pictures to Pixelfed_ or Mastodon_. +* importer: Import photos directly from a camera (not available on Windows). +* spelling: Install a spell checker for Photini's text entry fields. +* gpxpy: Allow importing of GPS data from a phone tracking app or similar. +* all: All of the above. + +You can also choose to install one or more Qt packages: + +* pyqt5 +* pyqt6 +* pyside2 +* pyside6 + +The extras are listed in square brackets when running pip_. +For example:: + + pip install photini[pyqt6,spelling,gpxpy] + +Note that the extras' names are not case sensitive. + Initial installation ^^^^^^^^^^^^^^^^^^^^ -Firstly install Photini with pip_: +Firstly install Photini and any required extras with pip_. +Make sure you include at least one Qt package: .. tabs:: .. code-tab:: none Linux/MacOS - (photini) jim@mint:~$ pip3 install photini - Collecting photini - Downloading Photini-2023.7.0-py3-none-any.whl (381 kB) - ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 381.9/381.9 kB 561.1 kB/s eta 0:00:00 - Collecting appdirs>=1.3 (from photini) - Downloading appdirs-1.4.4-py2.py3-none-any.whl (9.6 kB) - Collecting cachetools>=3.0 (from photini) - Downloading cachetools-5.3.1-py3-none-any.whl (9.3 kB) - Requirement already satisfied: chardet>=3.0 in /usr/lib/python3/dist-packages (from photini) (3.0.4) - Collecting exiv2>=0.14 (from photini) - Downloading exiv2-0.14.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (7.8 MB) - ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 7.8/7.8 MB 703.9 kB/s eta 0:00:00 - Requirement already satisfied: requests>=2.4 in /usr/lib/python3/dist-packages (from photini) (2.22.0) - Installing collected packages: exiv2, appdirs, cachetools, photini - Successfully installed appdirs-1.4.4 cachetools-5.3.1 exiv2-0.14.1 photini-2023.7.0 + (photini) jim@mint22:~$ pip install photini[pyqt5,gpxpy,spelling] + Collecting photini[gpxpy,pyqt5,spelling] + Downloading Photini-2024.8.2-py3-none-any.whl.metadata (11 kB) + Collecting appdirs>=1.3 (from photini[gpxpy,pyqt5,spelling]) + Downloading appdirs-1.4.4-py2.py3-none-any.whl.metadata (9.0 kB) + Collecting cachetools>=3.0 (from photini[gpxpy,pyqt5,spelling]) + Downloading cachetools-5.5.0-py3-none-any.whl.metadata (5.3 kB) + Requirement already satisfied: chardet>=3.0 in /usr/lib/python3/dist-packages (from photini[gpxpy,pyqt5,spelling]) (5.2.0) + Collecting exiv2>=0.16 (from photini[gpxpy,pyqt5,spelling]) + Downloading exiv2-0.17.0-cp312-cp312-manylinux_2_28_x86_64.whl.metadata (7.1 kB) + Requirement already satisfied: filetype>=1.0 in /usr/lib/python3/dist-packages (from photini[gpxpy,pyqt5,spelling]) (1.2.0) + Requirement already satisfied: Pillow>=2.0 in /usr/lib/python3/dist-packages (from photini[gpxpy,pyqt5,spelling]) (10.2.0) + Requirement already satisfied: requests>=2.4 in /usr/lib/python3/dist-packages (from photini[gpxpy,pyqt5,spelling]) (2.31.0) + Requirement already satisfied: PyQt5>=5.9 in /usr/lib/python3/dist-packages (from photini[gpxpy,pyqt5,spelling]) (5.15.10) + Requirement already satisfied: PyQtWebEngine>=5.12 in /usr/lib/python3/dist-packages (from photini[gpxpy,pyqt5,spelling]) (5.15.6) + Collecting gpxpy!=1.6.0,>=1.3.5 (from photini[gpxpy,pyqt5,spelling]) + Downloading gpxpy-1.6.2-py3-none-any.whl.metadata (5.9 kB) + Collecting pyenchant>=2.0 (from photini[gpxpy,pyqt5,spelling]) + Downloading pyenchant-3.2.2-py3-none-any.whl.metadata (3.8 kB) + Requirement already satisfied: PyQt5-sip<13,>=12.13 in /usr/lib/python3/dist-packages (from PyQt5>=5.9->photini[gpxpy,pyqt5,spelling]) (12.13.0) + Downloading appdirs-1.4.4-py2.py3-none-any.whl (9.6 kB) + Downloading cachetools-5.5.0-py3-none-any.whl (9.5 kB) + Downloading exiv2-0.17.0-cp312-cp312-manylinux_2_28_x86_64.whl (15.3 MB) + ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 15.3/15.3 MB 852.8 kB/s eta 0:00:00 + Downloading gpxpy-1.6.2-py3-none-any.whl (42 kB) + Downloading pyenchant-3.2.2-py3-none-any.whl (55 kB) + Downloading Photini-2024.8.2-py3-none-any.whl (418 kB) + Installing collected packages: exiv2, appdirs, pyenchant, gpxpy, cachetools, photini + Successfully installed appdirs-1.4.4 cachetools-5.5.0 exiv2-0.17.0 gpxpy-1.6.2 photini-2024.8.2 pyenchant-3.2.2 .. code-tab:: none Windows - (photini) C:\Users\Jim>pip install photini - Collecting photini + (photini) C:\Users\Jim>pip install photini[pyqt5,gpxpy,spelling] + Collecting photini[gpxpy,pyqt5,spelling] Downloading Photini-2024.8.2-py3-none-any.whl.metadata (11 kB) - Collecting appdirs>=1.3 (from photini) + Collecting appdirs>=1.3 (from photini[gpxpy,pyqt5,spelling]) Downloading appdirs-1.4.4-py2.py3-none-any.whl.metadata (9.0 kB) - Collecting cachetools>=3.0 (from photini) + Collecting cachetools>=3.0 (from photini[gpxpy,pyqt5,spelling]) Downloading cachetools-5.5.0-py3-none-any.whl.metadata (5.3 kB) - Collecting chardet>=3.0 (from photini) + Collecting chardet>=3.0 (from photini[gpxpy,pyqt5,spelling]) Downloading chardet-5.2.0-py3-none-any.whl.metadata (3.4 kB) - Collecting exiv2>=0.16 (from photini) + Collecting exiv2>=0.16 (from photini[gpxpy,pyqt5,spelling]) Downloading exiv2-0.17.0-cp38-cp38-win_amd64.whl.metadata (7.3 kB) - Collecting filetype>=1.0 (from photini) + Collecting filetype>=1.0 (from photini[gpxpy,pyqt5,spelling]) Downloading filetype-1.2.0-py2.py3-none-any.whl.metadata (6.5 kB) - Collecting Pillow>=2.0 (from photini) + Collecting Pillow>=2.0 (from photini[gpxpy,pyqt5,spelling]) Downloading pillow-10.4.0-cp38-cp38-win_amd64.whl.metadata (9.3 kB) - Collecting requests>=2.4 (from photini) + Collecting requests>=2.4 (from photini[gpxpy,pyqt5,spelling]) Downloading requests-2.32.3-py3-none-any.whl.metadata (4.6 kB) - Collecting charset-normalizer<4,>=2 (from requests>=2.4->photini) + Collecting PyQt5>=5.9 (from photini[gpxpy,pyqt5,spelling]) + Downloading PyQt5-5.15.11-cp38-abi3-win_amd64.whl.metadata (2.1 kB) + Collecting PyQtWebEngine>=5.12 (from photini[gpxpy,pyqt5,spelling]) + Downloading PyQtWebEngine-5.15.7-cp38-abi3-win_amd64.whl.metadata (1.9 kB) + Collecting pyenchant>=2.0 (from photini[gpxpy,pyqt5,spelling]) + Downloading pyenchant-3.2.2-py3-none-win_amd64.whl.metadata (3.8 kB) + Collecting gpxpy!=1.6.0,>=1.3.5 (from photini[gpxpy,pyqt5,spelling]) + Downloading gpxpy-1.6.2-py3-none-any.whl.metadata (5.9 kB) + Collecting PyQt5-sip<13,>=12.15 (from PyQt5>=5.9->photini[gpxpy,pyqt5,spelling]) + Downloading PyQt5_sip-12.15.0-cp38-cp38-win_amd64.whl.metadata (439 bytes) + Collecting PyQt5-Qt5<5.16.0,>=5.15.2 (from PyQt5>=5.9->photini[gpxpy,pyqt5,spelling]) + Downloading PyQt5_Qt5-5.15.2-py3-none-win_amd64.whl.metadata (552 bytes) + Collecting PyQtWebEngine-Qt5<5.16.0,>=5.15.0 (from PyQtWebEngine>=5.12->photini[gpxpy,pyqt5,spelling]) + Downloading PyQtWebEngine_Qt5-5.15.2-py3-none-win_amd64.whl.metadata (584 bytes) + Collecting charset-normalizer<4,>=2 (from requests>=2.4->photini[gpxpy,pyqt5,spelling]) Downloading charset_normalizer-3.3.2-cp38-cp38-win_amd64.whl.metadata (34 kB) - Collecting idna<4,>=2.5 (from requests>=2.4->photini) + Collecting idna<4,>=2.5 (from requests>=2.4->photini[gpxpy,pyqt5,spelling]) Downloading idna-3.8-py3-none-any.whl.metadata (9.9 kB) - Collecting urllib3<3,>=1.21.1 (from requests>=2.4->photini) - Downloading urllib3-2.2.2-py3-none-any.whl.metadata (6.4 kB) - Collecting certifi>=2017.4.17 (from requests>=2.4->photini) + Collecting urllib3<3,>=1.21.1 (from requests>=2.4->photini[gpxpy,pyqt5,spelling]) + Downloading urllib3-2.2.3-py3-none-any.whl.metadata (6.5 kB) + Collecting certifi>=2017.4.17 (from requests>=2.4->photini[gpxpy,pyqt5,spelling]) Downloading certifi-2024.8.30-py3-none-any.whl.metadata (2.2 kB) - Downloading Photini-2024.8.2-py3-none-any.whl (418 kB) Downloading appdirs-1.4.4-py2.py3-none-any.whl (9.6 kB) Downloading cachetools-5.5.0-py3-none-any.whl (9.5 kB) Downloading chardet-5.2.0-py3-none-any.whl (199 kB) Downloading exiv2-0.17.0-cp38-cp38-win_amd64.whl (8.5 MB) - ---------------------------------------- 8.5/8.5 MB 924.2 kB/s eta 0:00:00 + ---------------------------------------- 8.5/8.5 MB 453.3 kB/s eta 0:00:00 Downloading filetype-1.2.0-py2.py3-none-any.whl (19 kB) + Downloading gpxpy-1.6.2-py3-none-any.whl (42 kB) Downloading pillow-10.4.0-cp38-cp38-win_amd64.whl (2.6 MB) - ---------------------------------------- 2.6/2.6 MB 900.1 kB/s eta 0:00:00 + ---------------------------------------- 2.6/2.6 MB 457.0 kB/s eta 0:00:00 + Downloading pyenchant-3.2.2-py3-none-win_amd64.whl (11.9 MB) + ---------------------------------------- 11.9/11.9 MB 393.6 kB/s eta 0:00:00 + Downloading PyQt5-5.15.11-cp38-abi3-win_amd64.whl (6.9 MB) + ---------------------------------------- 6.9/6.9 MB 411.9 kB/s eta 0:00:00 + Downloading PyQtWebEngine-5.15.7-cp38-abi3-win_amd64.whl (184 kB) Downloading requests-2.32.3-py3-none-any.whl (64 kB) + Downloading Photini-2024.8.2-py3-none-any.whl (418 kB) Downloading certifi-2024.8.30-py3-none-any.whl (167 kB) Downloading charset_normalizer-3.3.2-cp38-cp38-win_amd64.whl (99 kB) Downloading idna-3.8-py3-none-any.whl (66 kB) - Downloading urllib3-2.2.2-py3-none-any.whl (121 kB) - Installing collected packages: filetype, exiv2, appdirs, urllib3, Pillow, idna, charset-normalizer, chardet, certifi, cachetools, requests, photini - Successfully installed Pillow-10.4.0 appdirs-1.4.4 cachetools-5.5.0 certifi-2024.8.30 chardet-5.2.0 charset-normalizer-3.3.2 exiv2-0.17.0 filetype-1.2.0 idna-3.8 photini-2024.8.2 requests-2.32.3 urllib3-2.2.2 - -Photini's optional dependencies can be included in the installation by listing them as "extras" in the pip command. -For example, if you want to be able to upload to Flickr and Ipernity: - -.. tabs:: - .. code-tab:: none Linux/MacOS - - (photini) jim@mint:~$ pip3 install "photini[flickr,ipernity]" - .. code-tab:: none Windows - - (photini) C:\Users\Jim>pip install photini[flickr,ipernity] - -Note that the extras' names are not case-sensitive. - -.. versionadded:: 2023.7.0 - You can install all of Photini's optional dependencies by adding an ``all`` extra. - You can also install any of the Qt packages as extras: - -.. tabs:: - .. code-tab:: none Linux/MacOS - - (photini) jim@mint:~$ pip3 install "photini[all,pyqt5,pyside6]" - .. code-tab:: none Windows - - (photini) C:\Users\Jim>pip install photini[all,pyqt5,pyside6] - -Now run the ``photini-configure`` command to choose which Qt package to use. -(The Windows example is running Windows |nbsp| 7, so PyQt6 and PySide6 are not available): - -.. tabs:: - .. code-tab:: none Linux/MacOS - - (photini) jim@mint:~$ photini-configure - Which Qt package would you like to use? - 0 PyQt5 [installed] - 1 PySide2 [installed] - 2 PyQt6 [not installed] - 3 PySide6 [not installed] - Choose 0/1/2/3: 0 - Would you like to upload pictures to Flickr? (y/n): - Would you like to upload pictures to Google Photos? (y/n): - Would you like to upload pictures to Ipernity? (y/n): - Would you like to upload pictures to Pixelfed or Mastodon? (y/n): - Would you like to check spelling of metadata? (y/n) [y]: n - Would you like to import GPS track data? (y/n) [y]: n - Would you like to make higher quality thumbnails? (y/n) [y]: n - Would you like to import pictures from a camera? (y/n): - .. code-tab:: none Windows - - (photini) C:\Users\Jim>photini-configure - Which Qt package would you like to use? - 0 PyQt5 [not installed] - 1 PySide2 [not installed] - Choose 0/1 [1]: 0 - Would you like to upload pictures to Flickr? (y/n) [y]: n - Would you like to upload pictures to Google Photos? (y/n) [y]: n - Would you like to upload pictures to Ipernity? (y/n) [y]: n - Would you like to upload pictures to Pixelfed or Mastodon? (y/n) [y]: n - Would you like to check spelling of metadata? (y/n) [y]: n - Would you like to import GPS track data? (y/n) [y]: n - c:\users\jim\photini\scripts\python.exe -m pip install photini[PyQt5] - Requirement already satisfied: photini[PyQt5] in c:\users\jim\photini\lib\site-packages (2024.8.2) - Requirement already satisfied: appdirs>=1.3 in c:\users\jim\photini\lib\site-packages (from photini[PyQt5]) (1.4.4) - Requirement already satisfied: cachetools>=3.0 in c:\users\jim\photini\lib\site-packages (from photini[PyQt5]) (5.5.0) - Requirement already satisfied: chardet>=3.0 in c:\users\jim\photini\lib\site-packages (from photini[PyQt5]) (5.2.0) - Requirement already satisfied: exiv2>=0.16 in c:\users\jim\photini\lib\site-packages (from photini[PyQt5]) (0.17.0) - Requirement already satisfied: filetype>=1.0 in c:\users\jim\photini\lib\site-packages (from photini[PyQt5]) (1.2.0) - Requirement already satisfied: Pillow>=2.0 in c:\users\jim\photini\lib\site-packages (from photini[PyQt5]) (10.4.0) - Requirement already satisfied: requests>=2.4 in c:\users\jim\photini\lib\site-packages (from photini[PyQt5]) (2.32.3) - Collecting PyQt5>=5.9 (from photini[PyQt5]) - Downloading PyQt5-5.15.11-cp38-abi3-win_amd64.whl.metadata (2.1 kB) - Collecting PyQtWebEngine>=5.12 (from photini[PyQt5]) - Downloading PyQtWebEngine-5.15.7-cp38-abi3-win_amd64.whl.metadata (1.9 kB) - Collecting PyQt5-sip<13,>=12.15 (from PyQt5>=5.9->photini[PyQt5]) - Downloading PyQt5_sip-12.15.0-cp38-cp38-win_amd64.whl.metadata (439 bytes) - Collecting PyQt5-Qt5<5.16.0,>=5.15.2 (from PyQt5>=5.9->photini[PyQt5]) - Downloading PyQt5_Qt5-5.15.2-py3-none-win_amd64.whl.metadata (552 bytes) - Collecting PyQtWebEngine-Qt5<5.16.0,>=5.15.0 (from PyQtWebEngine>=5.12->photini[PyQt5]) - Downloading PyQtWebEngine_Qt5-5.15.2-py3-none-win_amd64.whl.metadata (584 bytes) - Requirement already satisfied: charset-normalizer<4,>=2 in c:\users\jim\photini\lib\site-packages (from requests>=2.4->photini[PyQt5]) (3.3.2) - Requirement already satisfied: idna<4,>=2.5 in c:\users\jim\photini\lib\site-packages (from requests>=2.4->photini[PyQt5]) (3.8) - Requirement already satisfied: urllib3<3,>=1.21.1 in c:\users\jim\photini\lib\site-packages (from requests>=2.4->photini[PyQt5]) (2.2.2) - Requirement already satisfied: certifi>=2017.4.17 in c:\users\jim\photini\lib\site-packages (from requests>=2.4->photini[PyQt5]) (2024.8.30) - Downloading PyQt5-5.15.11-cp38-abi3-win_amd64.whl (6.9 MB) - ---------------------------------------- 6.9/6.9 MB 928.9 kB/s eta 0:00:00 - Downloading PyQtWebEngine-5.15.7-cp38-abi3-win_amd64.whl (184 kB) Downloading PyQt5_Qt5-5.15.2-py3-none-win_amd64.whl (50.1 MB) - ---------------------------------------- 50.1/50.1 MB 938.1 kB/s eta 0:00:00 + ---------------------------------------- 50.1/50.1 MB 439.4 kB/s eta 0:00:00 Downloading PyQt5_sip-12.15.0-cp38-cp38-win_amd64.whl (59 kB) Downloading PyQtWebEngine_Qt5-5.15.2-py3-none-win_amd64.whl (60.0 MB) - ---------------------------------------- 60.0/60.0 MB 939.9 kB/s eta 0:00:00 - Installing collected packages: PyQtWebEngine-Qt5, PyQt5-Qt5, PyQt5-sip, PyQt5, PyQtWebEngine - Successfully installed PyQt5-5.15.11 PyQt5-Qt5-5.15.2 PyQt5-sip-12.15.0 PyQtWebEngine-5.15.7 PyQtWebEngine-Qt5-5.15.2 - -The command asks a series of questions, then runs pip_ to install any extra dependencies that are needed, then updates your Photini configuration file. + ---------------------------------------- 60.0/60.0 MB 399.9 kB/s eta 0:00:00 + Downloading urllib3-2.2.3-py3-none-any.whl (126 kB) + Installing collected packages: PyQtWebEngine-Qt5, PyQt5-Qt5, filetype, exiv2, appdirs, urllib3, PyQt5-sip, pyenchant, Pillow, idna, gpxpy, charset-normalizer, chardet, certifi, cachetools, requests, PyQt5, PyQtWebEngine, photini + Successfully installed Pillow-10.4.0 PyQt5-5.15.11 PyQt5-Qt5-5.15.2 PyQt5-sip-12.15.0 PyQtWebEngine-5.15.7 PyQtWebEngine-Qt5-5.15.2 appdirs-1.4.4 cachetools-5.5.0 certifi-2024.8.30 chardet-5.2.0 charset-normalizer-3.3.2 exiv2-0.17.0 filetype-1.2.0 gpxpy-1.6.2 idna-3.8 photini-2024.8.2 pyenchant-3.2.2 requests-2.32.3 urllib3-2.2.3 Test the installation ^^^^^^^^^^^^^^^^^^^^^ @@ -371,9 +340,8 @@ Now you should be able to run photini: .. tabs:: .. code-tab:: none Linux/MacOS - (photini) jim@mint:~$ python3 -m photini - No module named 'enchant' - No module named 'gpxpy' + (photini) jim@mint22:~$ python -m photini + ffmpeg or ffprobe not found No module named 'requests_oauthlib' No module named 'requests_toolbelt' No module named 'requests_oauthlib' @@ -382,8 +350,6 @@ Now you should be able to run photini: (photini) C:\Users\Jim>python -m photini ffmpeg or ffprobe not found - No module named 'enchant' - No module named 'gpxpy' No module named 'requests_oauthlib' No module named 'requests_toolbelt' No module named 'requests_oauthlib' @@ -402,133 +368,112 @@ For example, failing to load a Qt plugin (on Debian) can be cured by installing Optional dependencies ^^^^^^^^^^^^^^^^^^^^^ -Most of the dependencies required for Photini's optional features can also be installed with ``photini-configure``. -Default answers are given in square brackets: +If you'd like to add any of the "extras" listed earlier to your Photini installation, you just need to run pip_ again: .. tabs:: .. code-tab:: none Linux/MacOS - (photini) jim@mint:~$ photini-configure - Which Qt package would you like to use? - 0 PyQt5 [installed] - 1 PySide2 [installed] - 2 PyQt6 [not installed] - 3 PySide6 [not installed] - Choose 0/1/2/3 [0]: - Would you like to upload pictures to Flickr? (y/n) [y]: - Would you like to upload pictures to Google Photos? (y/n) [y]: - Would you like to upload pictures to Ipernity? (y/n) [y]: - Would you like to upload pictures to Pixelfed or Mastodon? (y/n) [y]: - Would you like to check spelling of metadata? (y/n) [y]: - Would you like to import GPS track data? (y/n) [y]: - Would you like to make higher quality thumbnails? (y/n) [y]: - Would you like to import pictures from a camera? (y/n) [y]: - /home/jim/photini/bin/python3 -m pip install photini[flickr,google,ipernity,pixelfed,spelling,gpxpy,Pillow,importer] - Requirement already satisfied: photini[Pillow,flickr,google,gpxpy,importer,ipernity,pixelfed,spelling] in ./photini/lib/python3.8/site-packages (2023.7.0) - Requirement already satisfied: appdirs>=1.3 in ./photini/lib/python3.8/site-packages (from photini[Pillow,flickr,google,gpxpy,importer,ipernity,pixelfed,spelling]) (1.4.4) - Requirement already satisfied: cachetools>=3.0 in ./photini/lib/python3.8/site-packages (from photini[Pillow,flickr,google,gpxpy,importer,ipernity,pixelfed,spelling]) (5.3.1) - Requirement already satisfied: chardet>=3.0 in /usr/lib/python3/dist-packages (from photini[Pillow,flickr,google,gpxpy,importer,ipernity,pixelfed,spelling]) (3.0.4) - Requirement already satisfied: exiv2>=0.14 in ./photini/lib/python3.8/site-packages (from photini[Pillow,flickr,google,gpxpy,importer,ipernity,pixelfed,spelling]) (0.14.1) - Requirement already satisfied: requests>=2.4 in /usr/lib/python3/dist-packages (from photini[Pillow,flickr,google,gpxpy,importer,ipernity,pixelfed,spelling]) (2.22.0) - Collecting gphoto2>=1.8 (from photini[Pillow,flickr,google,gpxpy,importer,ipernity,pixelfed,spelling]) - Downloading gphoto2-2.3.4-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl (5.9 MB) - ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 5.9/5.9 MB 699.7 kB/s eta 0:00:00 - Requirement already satisfied: Pillow>=2.0 in /usr/lib/python3/dist-packages (from photini[Pillow,flickr,google,gpxpy,importer,ipernity,pixelfed,spelling]) (7.0.0) - Collecting pyenchant>=2.0 (from photini[Pillow,flickr,google,gpxpy,importer,ipernity,pixelfed,spelling]) - Downloading pyenchant-3.2.2-py3-none-any.whl (55 kB) - ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 55.7/55.7 kB 262.1 kB/s eta 0:00:00 - Collecting gpxpy>=1.3.5 (from photini[Pillow,flickr,google,gpxpy,importer,ipernity,pixelfed,spelling]) - Downloading gpxpy-1.5.0.tar.gz (111 kB) - ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 111.6/111.6 kB 411.6 kB/s eta 0:00:00 - Preparing metadata (setup.py) ... done - Requirement already satisfied: keyring>=7.0 in /usr/lib/python3/dist-packages (from photini[Pillow,flickr,google,gpxpy,importer,ipernity,pixelfed,spelling]) (18.0.1) - Collecting requests-toolbelt>=0.9 (from photini[Pillow,flickr,google,gpxpy,importer,ipernity,pixelfed,spelling]) - Downloading requests_toolbelt-1.0.0-py2.py3-none-any.whl (54 kB) - ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 54.5/54.5 kB 237.6 kB/s eta 0:00:00 - Collecting requests-oauthlib>=1.0 (from photini[Pillow,flickr,google,gpxpy,importer,ipernity,pixelfed,spelling]) - Downloading requests_oauthlib-1.3.1-py2.py3-none-any.whl (23 kB) - Requirement already satisfied: secretstorage in /usr/lib/python3/dist-packages (from keyring>=7.0->photini[Pillow,flickr,google,gpxpy,importer,ipernity,pixelfed,spelling]) (2.3.1) - Requirement already satisfied: oauthlib>=3.0.0 in /usr/lib/python3/dist-packages (from requests-oauthlib>=1.0->photini[Pillow,flickr,google,gpxpy,importer,ipernity,pixelfed,spelling]) (3.1.0) - Building wheels for collected packages: gpxpy - Building wheel for gpxpy (setup.py) ... done - Created wheel for gpxpy: filename=gpxpy-1.5.0-py3-none-any.whl size=42878 sha256=77a7531cbed8cd315f03427adccc74c15fbae41a01fc4e160a4c6c959fc372ff - Stored in directory: /home/jim/.cache/pip/wheels/93/15/ce/1cd2782b440b8a517b89c3fa112f79f7015bd6e51b552e1b1a - Successfully built gpxpy - Installing collected packages: gphoto2, requests-toolbelt, requests-oauthlib, pyenchant, gpxpy - Successfully installed gphoto2-2.3.4 gpxpy-1.5.0 pyenchant-3.2.2 requests-oauthlib-1.3.1 requests-toolbelt-1.0.0 + (photini) jim@mint22:~$ pip install photini[flickr] + Requirement already satisfied: photini[flickr] in ./photini/lib/python3.12/site-packages (2024.8.2) + Requirement already satisfied: appdirs>=1.3 in ./photini/lib/python3.12/site-packages (from photini[flickr]) (1.4.4) + Requirement already satisfied: cachetools>=3.0 in ./photini/lib/python3.12/site-packages (from photini[flickr]) (5.5.0) + Requirement already satisfied: chardet>=3.0 in /usr/lib/python3/dist-packages (from photini[flickr]) (5.2.0) + Requirement already satisfied: exiv2>=0.16 in ./photini/lib/python3.12/site-packages (from photini[flickr]) (0.17.0) + Requirement already satisfied: filetype>=1.0 in /usr/lib/python3/dist-packages (from photini[flickr]) (1.2.0) + Requirement already satisfied: Pillow>=2.0 in /usr/lib/python3/dist-packages (from photini[flickr]) (10.2.0) + Requirement already satisfied: requests>=2.4 in /usr/lib/python3/dist-packages (from photini[flickr]) (2.31.0) + Collecting keyring>=7.0 (from photini[flickr]) + Downloading keyring-25.3.0-py3-none-any.whl.metadata (20 kB) + Collecting requests-oauthlib>=1.0 (from photini[flickr]) + Downloading requests_oauthlib-2.0.0-py2.py3-none-any.whl.metadata (11 kB) + Collecting requests-toolbelt>=0.9 (from photini[flickr]) + Downloading requests_toolbelt-1.0.0-py2.py3-none-any.whl.metadata (14 kB) + Collecting jaraco.classes (from keyring>=7.0->photini[flickr]) + Downloading jaraco.classes-3.4.0-py3-none-any.whl.metadata (2.6 kB) + Collecting jaraco.functools (from keyring>=7.0->photini[flickr]) + Downloading jaraco.functools-4.0.2-py3-none-any.whl.metadata (2.8 kB) + Collecting jaraco.context (from keyring>=7.0->photini[flickr]) + Downloading jaraco.context-6.0.1-py3-none-any.whl.metadata (4.1 kB) + Collecting SecretStorage>=3.2 (from keyring>=7.0->photini[flickr]) + Downloading SecretStorage-3.3.3-py3-none-any.whl.metadata (4.0 kB) + Collecting jeepney>=0.4.2 (from keyring>=7.0->photini[flickr]) + Downloading jeepney-0.8.0-py3-none-any.whl.metadata (1.3 kB) + Requirement already satisfied: oauthlib>=3.0.0 in /usr/lib/python3/dist-packages (from requests-oauthlib>=1.0->photini[flickr]) (3.2.2) + Requirement already satisfied: cryptography>=2.0 in /usr/lib/python3/dist-packages (from SecretStorage>=3.2->keyring>=7.0->photini[flickr]) (41.0.7) + Collecting more-itertools (from jaraco.classes->keyring>=7.0->photini[flickr]) + Downloading more_itertools-10.5.0-py3-none-any.whl.metadata (36 kB) + Downloading keyring-25.3.0-py3-none-any.whl (38 kB) + Downloading requests_oauthlib-2.0.0-py2.py3-none-any.whl (24 kB) + Downloading requests_toolbelt-1.0.0-py2.py3-none-any.whl (54 kB) + Downloading jeepney-0.8.0-py3-none-any.whl (48 kB) + Downloading SecretStorage-3.3.3-py3-none-any.whl (15 kB) + Downloading jaraco.classes-3.4.0-py3-none-any.whl (6.8 kB) + Downloading jaraco.context-6.0.1-py3-none-any.whl (6.8 kB) + Downloading jaraco.functools-4.0.2-py3-none-any.whl (9.9 kB) + Downloading more_itertools-10.5.0-py3-none-any.whl (60 kB) + Installing collected packages: requests-toolbelt, requests-oauthlib, more-itertools, jeepney, jaraco.context, SecretStorage, jaraco.functools, jaraco.classes, keyring + Successfully installed SecretStorage-3.3.3 jaraco.classes-3.4.0 jaraco.context-6.0.1 jaraco.functools-4.0.2 jeepney-0.8.0 keyring-25.3.0 more-itertools-10.5.0 requests-oauthlib-2.0.0 requests-toolbelt-1.0.0 .. code-tab:: none Windows - (photini) C:\Users\Jim>photini-configure - Which Qt package would you like to use? - 0 PyQt5 [installed] - 1 PySide2 [not installed] - Choose 0/1 [0]: - Would you like to upload pictures to Flickr? (y/n) [y]: - Would you like to upload pictures to Google Photos? (y/n) [y]: - Would you like to upload pictures to Ipernity? (y/n) [y]: - Would you like to upload pictures to Pixelfed or Mastodon? (y/n) [y]: - Would you like to check spelling of metadata? (y/n) [y]: - Would you like to import GPS track data? (y/n) [y]: - Would you like to make higher quality thumbnails? (y/n) [y]: - c:\users\jim\photini\scripts\python.exe -m pip install photini[flickr,google,ipernity,pixelfed,spelling,gpxpy,Pillow] - Requirement already satisfied: photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling] in c:\users\jim\photini\lib\site-packages (2023.10.0) - Requirement already satisfied: appdirs>=1.3 in c:\users\jim\photini\lib\site-packages (from photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) (1.4.4) - Requirement already satisfied: cachetools>=3.0 in c:\users\jim\photini\lib\site-packages (from photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) (5.3.2) - Requirement already satisfied: chardet>=3.0 in c:\users\jim\photini\lib\site-packages (from photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) (5.2.0) - Requirement already satisfied: exiv2>=0.14 in c:\users\jim\photini\lib\site-packages (from photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) (0.14.1) - Requirement already satisfied: requests>=2.4 in c:\users\jim\photini\lib\site-packages (from photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) (2.31.0) - Collecting gpxpy>=1.3.5 (from photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) - Downloading gpxpy-1.6.0-py3-none-any.whl.metadata (5.9 kB) - Collecting pyenchant>=2.0 (from photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) - Downloading pyenchant-3.2.2-py3-none-win_amd64.whl (11.9 MB) - -------------------------------------- 11.9/11.9 MB 973.5 kB/s eta 0:00:00 - Collecting Pillow>=2.0 (from photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) - Downloading Pillow-10.1.0-cp38-cp38-win_amd64.whl.metadata (9.6 kB) - Requirement already satisfied: charset-normalizer<4,>=2 in c:\users\jim\photini\lib\site-packages (from requests>=2.4->photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) (3.3.1) - Requirement already satisfied: idna<4,>=2.5 in c:\users\jim\photini\lib\site-packages (from requests>=2.4->photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) (3.4) - Requirement already satisfied: urllib3<3,>=1.21.1 in c:\users\jim\photini\lib\site-packages (from requests>=2.4->photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) (2.0.7) - Requirement already satisfied: certifi>=2017.4.17 in c:\users\jim\photini\lib\site-packages (from requests>=2.4->photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) (2023.7.22) - Collecting requests-oauthlib>=1.0 (from photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) - Downloading requests_oauthlib-1.3.1-py2.py3-none-any.whl (23 kB) - Collecting keyring>=7.0 (from photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) - Downloading keyring-24.2.0-py3-none-any.whl.metadata (20 kB) - Collecting requests-toolbelt>=0.9 (from photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) - Downloading requests_toolbelt-1.0.0-py2.py3-none-any.whl (54 kB) - -------------------------------------- 54.5/54.5 kB 202.9 kB/s eta 0:00:00 - Collecting jaraco.classes (from keyring>=7.0->photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) - Downloading jaraco.classes-3.3.0-py3-none-any.whl.metadata (2.9 kB) - Collecting importlib-metadata>=4.11.4 (from keyring>=7.0->photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) - Downloading importlib_metadata-6.8.0-py3-none-any.whl.metadata (5.1 kB) - Collecting importlib-resources (from keyring>=7.0->photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) - Downloading importlib_resources-6.1.0-py3-none-any.whl.metadata (4.1 kB) - Collecting pywin32-ctypes>=0.2.0 (from keyring>=7.0->photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) - Downloading pywin32_ctypes-0.2.2-py3-none-any.whl.metadata (3.8 kB) - Collecting oauthlib>=3.0.0 (from requests-oauthlib>=1.0->photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) - Downloading oauthlib-3.2.2-py3-none-any.whl (151 kB) - ------------------------------------ 151.7/151.7 kB 274.1 kB/s eta 0:00:00 - Collecting zipp>=0.5 (from importlib-metadata>=4.11.4->keyring>=7.0->photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) - Downloading zipp-3.17.0-py3-none-any.whl.metadata (3.7 kB) - Collecting more-itertools (from jaraco.classes->keyring>=7.0->photini[Pillow,flickr,google,gpxpy,ipernity,pixelfed,spelling]) - Downloading more_itertools-10.1.0-py3-none-any.whl.metadata (33 kB) - Downloading gpxpy-1.6.0-py3-none-any.whl (42 kB) - ---------------------------------------- 42.6/42.6 kB 138.5 kB/s eta 0:00:00 - Downloading Pillow-10.1.0-cp38-cp38-win_amd64.whl (2.6 MB) - ---------------------------------------- 2.6/2.6 MB 950.1 kB/s eta 0:00:00 - Downloading keyring-24.2.0-py3-none-any.whl (37 kB) - Downloading importlib_metadata-6.8.0-py3-none-any.whl (22 kB) - Downloading pywin32_ctypes-0.2.2-py3-none-any.whl (30 kB) - Downloading importlib_resources-6.1.0-py3-none-any.whl (33 kB) - Downloading jaraco.classes-3.3.0-py3-none-any.whl (5.9 kB) - Downloading zipp-3.17.0-py3-none-any.whl (7.4 kB) - Downloading more_itertools-10.1.0-py3-none-any.whl (55 kB) - ---------------------------------------- 55.8/55.8 kB 194.8 kB/s eta 0:00:00 - Installing collected packages: zipp, pywin32-ctypes, pyenchant, Pillow, oauthlib, more-itertools, gpxpy, requests-toolbelt, requests-oauthlib, jaraco.classes, importlib-resources, importlib-metadata, keyring - Successfully installed Pillow-10.1.0 gpxpy-1.6.0 importlib-metadata-6.8.0 importlib-resources-6.1.0 jaraco.classes-3.3.0 keyring-24.2.0 more-itertools-10.1.0 oauthlib-3.2.2 pyenchant-3.2.2 pywin32-ctypes-0.2.2 requests-oauthlib-1.3.1 requests-toolbelt-1.0.0 zipp-3.17.0 + (photini) C:\Users\Jim>pip install photini[flickr] + Requirement already satisfied: photini[flickr] in c:\users\jim\photini\lib\site-packages (2024.8.2) + Requirement already satisfied: appdirs>=1.3 in c:\users\jim\photini\lib\site-packages (from photini[flickr]) (1.4.4) + Requirement already satisfied: cachetools>=3.0 in c:\users\jim\photini\lib\site-packages (from photini[flickr]) (5.5.0) + Requirement already satisfied: chardet>=3.0 in c:\users\jim\photini\lib\site-packages (from photini[flickr]) (5.2.0) + Requirement already satisfied: exiv2>=0.16 in c:\users\jim\photini\lib\site-packages (from photini[flickr]) (0.17.0) + Requirement already satisfied: filetype>=1.0 in c:\users\jim\photini\lib\site-packages (from photini[flickr]) (1.2.0) + Requirement already satisfied: Pillow>=2.0 in c:\users\jim\photini\lib\site-packages (from photini[flickr]) (10.4.0) + Requirement already satisfied: requests>=2.4 in c:\users\jim\photini\lib\site-packages (from photini[flickr]) (2.32.3) + Requirement already satisfied: charset-normalizer<4,>=2 in c:\users\jim\photini\lib\site-packages (from requests>=2.4->photini[flickr]) (3.3.2) + Requirement already satisfied: idna<4,>=2.5 in c:\users\jim\photini\lib\site-packages (from requests>=2.4->photini[flickr]) (3.8) + Requirement already satisfied: urllib3<3,>=1.21.1 in c:\users\jim\photini\lib\site-packages (from requests>=2.4->photini[flickr]) (2.2.3) + Requirement already satisfied: certifi>=2017.4.17 in c:\users\jim\photini\lib\site-packages (from requests>=2.4->photini[flickr]) (2024.8.30) + Collecting keyring>=7.0 (from photini[flickr]) + Downloading keyring-25.3.0-py3-none-any.whl.metadata (20 kB) + Collecting requests-toolbelt>=0.9 (from photini[flickr]) + Downloading requests_toolbelt-1.0.0-py2.py3-none-any.whl.metadata (14 kB) + Collecting requests-oauthlib>=1.0 (from photini[flickr]) + Downloading requests_oauthlib-2.0.0-py2.py3-none-any.whl.metadata (11 kB) + Collecting jaraco.classes (from keyring>=7.0->photini[flickr]) + Downloading jaraco.classes-3.4.0-py3-none-any.whl.metadata (2.6 kB) + Collecting jaraco.functools (from keyring>=7.0->photini[flickr]) + Downloading jaraco.functools-4.0.2-py3-none-any.whl.metadata (2.8 kB) + Collecting jaraco.context (from keyring>=7.0->photini[flickr]) + Downloading jaraco.context-6.0.1-py3-none-any.whl.metadata (4.1 kB) + Collecting importlib-metadata>=4.11.4 (from keyring>=7.0->photini[flickr]) + Downloading importlib_metadata-8.5.0-py3-none-any.whl.metadata (4.8 kB) + Collecting importlib-resources (from keyring>=7.0->photini[flickr]) + Downloading importlib_resources-6.4.5-py3-none-any.whl.metadata (4.0 kB) + Collecting pywin32-ctypes>=0.2.0 (from keyring>=7.0->photini[flickr]) + Downloading pywin32_ctypes-0.2.3-py3-none-any.whl.metadata (3.9 kB) + Collecting oauthlib>=3.0.0 (from requests-oauthlib>=1.0->photini[flickr]) + Downloading oauthlib-3.2.2-py3-none-any.whl.metadata (7.5 kB) + Collecting zipp>=3.20 (from importlib-metadata>=4.11.4->keyring>=7.0->photini[flickr]) + Downloading zipp-3.20.1-py3-none-any.whl.metadata (3.7 kB) + Collecting more-itertools (from jaraco.classes->keyring>=7.0->photini[flickr]) + Downloading more_itertools-10.5.0-py3-none-any.whl.metadata (36 kB) + Collecting backports.tarfile (from jaraco.context->keyring>=7.0->photini[flickr]) + Downloading backports.tarfile-1.2.0-py3-none-any.whl.metadata (2.0 kB) + Downloading keyring-25.3.0-py3-none-any.whl (38 kB) + Downloading requests_oauthlib-2.0.0-py2.py3-none-any.whl (24 kB) + Downloading requests_toolbelt-1.0.0-py2.py3-none-any.whl (54 kB) + Downloading importlib_metadata-8.5.0-py3-none-any.whl (26 kB) + Downloading oauthlib-3.2.2-py3-none-any.whl (151 kB) + Downloading pywin32_ctypes-0.2.3-py3-none-any.whl (30 kB) + Downloading importlib_resources-6.4.5-py3-none-any.whl (36 kB) + Downloading jaraco.classes-3.4.0-py3-none-any.whl (6.8 kB) + Downloading jaraco.context-6.0.1-py3-none-any.whl (6.8 kB) + Downloading jaraco.functools-4.0.2-py3-none-any.whl (9.9 kB) + Downloading zipp-3.20.1-py3-none-any.whl (9.0 kB) + Downloading backports.tarfile-1.2.0-py3-none-any.whl (30 kB) + Downloading more_itertools-10.5.0-py3-none-any.whl (60 kB) + Installing collected packages: zipp, pywin32-ctypes, oauthlib, more-itertools, backports.tarfile, requests-toolbelt, requests-oauthlib, jaraco.functools, jaraco.context, jaraco.classes, importlib-resources, importlib-metadata, keyring + Successfully installed backports.tarfile-1.2.0 importlib-metadata-8.5.0 importlib-resources-6.4.5 jaraco.classes-3.4.0 jaraco.context-6.0.1 jaraco.functools-4.0.2 keyring-25.3.0 more-itertools-10.5.0 oauthlib-3.2.2 pywin32-ctypes-0.2.3 requests-oauthlib-2.0.0 requests-toolbelt-1.0.0 zipp-3.20.1 Photini's spelling checker may require some other files to be installed. See the `pyenchant documentation`_ for platform specific instructions. -One optional dependency that cannot be installed with pip_ or ``photini-configure`` is FFmpeg_. +One optional dependency that cannot be installed with pip_ is FFmpeg_. This is used to read metadata from video files. Linux & MacOS users can install it with the system package manager, but installing it on Windows is non-trivial. @@ -541,7 +486,7 @@ These can be installed with the ``photini-post-install`` command: .. tabs:: .. code-tab:: none Linux - (photini) jim@mint:~$ photini-post-install + (photini) jim@mint22:~$ photini-post-install Creating /tmp/tmpj9rn81aj/photini.desktop Installing /tmp/tmpj9rn81aj/photini.desktop to /home/jim/.local/share/applications @@ -569,14 +514,14 @@ If you'd like to help develop and test a solution, do get in touch with me. Localisation """""""""""" -The ``photini-post-install`` command has a ``--language`` option that can set the language used for the description that accompaines a desktop icon (if Photini has been translated into that language). +The ``photini-post-install`` command has an option ``--language`` (or ``-l``) that can set the language used for the description that accompaines a desktop icon (if Photini has been translated into that language). .. tabs:: .. code-tab:: none Linux - (photini) jim@mint:~$ photini-post-install --language fr - Creating /tmp/tmpbav0qrsb/photini.desktop - Installing /tmp/tmpbav0qrsb/photini.desktop + (photini) jim@mint22:~$ photini-post-install --language fr + Creating /tmp/tmpecj_yk1e/photini.desktop + Installing /tmp/tmpecj_yk1e/photini.desktop to /home/jim/.local/share/applications .. code-tab:: none Windows @@ -599,7 +544,7 @@ Only read permission is needed.) .. tabs:: .. code-tab:: none Linux/MacOS - sarah@mint:~$ /home/jim/photini/bin/photini + sarah@mint22:~$ /home/jim/photini/bin/photini .. code-tab:: none Windows C:\Users\Sarah>..\Jim\photini\Scripts\photini.exe @@ -609,42 +554,10 @@ This is not a very convenient way to run Photini, so most users will want to add .. tabs:: .. code-tab:: none Linux - sarah@mint:~$ /home/jim/photini/bin/photini-post-install - desktop-file-install \ - --dir=/home/sarah/.local/share/applications \ - --set-key=Exec \ - --set-value=/home/jim/photini/bin/photini %F \ - --set-key=Icon \ - --set-value=/home/jim/photini/lib/python3.8/site-packages/photini/data/icons/photini_48.png \ - --set-key=GenericName[ca] \ - --set-value=Photini editor de metadades de foto \ - --set-key=Comment[ca] \ - --set-value=Un editor de metadades de foto digital fàcil d'usar. \ - --set-key=GenericName[cs] \ - --set-value=Editor fotografických popisných údajů Photini \ - --set-key=Comment[cs] \ - --set-value=Snadno se používající editor popisů digitálních fotografií. \ - --set-key=GenericName[de] \ - --set-value=Photini-Fotometadateneditor \ - --set-key=Comment[de] \ - --set-value=Ein einfach zu bedienender Metadaten-Editor für digitale Bilder. \ - --set-key=GenericName[es] \ - --set-value=Photini editor de metadatos fotográficos \ - --set-key=Comment[es] \ - --set-value=Un editor de metadatos fotográficos fácil de usar. \ - --set-key=GenericName[fr] \ - --set-value=Éditeur de métadonnées de photos Photini \ - --set-key=Comment[fr] \ - --set-value=Une application d'édition des métadonnées des photographies numériques (Exif, IPTC, XMP) facile à utiliser. \ - --set-key=GenericName[it] \ - --set-value=Editor di metadati fotografici di Photini \ - --set-key=Comment[it] \ - --set-value=Un'applicazione di modifica dei metadati delle fotografie digitali (Exif, IPTC, XMP) facile da usare. \ - --set-key=GenericName[pl] \ - --set-value=Photini edytor metadanych zdjęcia \ - --set-key=Comment[pl] \ - --set-value=Łatwy w użyciu edytor metadanych fotografii cyfrowej. \ - /home/jim/photini/lib/python3.8/site-packages/photini/data/linux/photini.desktop + sarah@mint22:~$ /home/jim/photini/bin/photini-post-install + Creating /tmp/tmplavuaj12/photini.desktop + Installing /tmp/tmplavuaj12/photini.desktop + to /home/sarah/.local/share/applications .. code-tab:: none Windows C:\Users\Sarah>..\Jim\photini\Scripts\photini-post-install.exe @@ -656,48 +569,15 @@ This is not a very convenient way to run Photini, so most users will want to add Writing HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\App Paths\photini.exe Writing HKEY_CURRENT_USER\Software\Classes\Applications\photini.exe -To install Photini menu shortcuts for all users you can run the post install command as root (Linux) or in a command window run as administrator (Windows). +To install Photini menu shortcuts for all users (not recommended) you can run the post install command as root (Linux) or in a command window run as administrator (Windows). It is important to use the full path to the post install command: .. tabs:: .. code-tab:: none Linux - jim@mint:~$ sudo /home/jim/photini/bin/photini-post-install - [sudo] password for jim: - desktop-file-install \ - --set-key=Exec \ - --set-value=/home/jim/photini/bin/photini %F \ - --set-key=Icon \ - --set-value=/home/jim/photini/lib/python3.8/site-packages/photini/data/icons/photini_48.png \ - --set-key=GenericName[ca] \ - --set-value=Photini editor de metadades de foto \ - --set-key=Comment[ca] \ - --set-value=Un editor de metadades de foto digital fàcil d'usar. \ - --set-key=GenericName[cs] \ - --set-value=Editor fotografických popisných údajů Photini \ - --set-key=Comment[cs] \ - --set-value=Snadno se používající editor popisů digitálních fotografií. \ - --set-key=GenericName[de] \ - --set-value=Photini-Fotometadateneditor \ - --set-key=Comment[de] \ - --set-value=Ein einfach zu bedienender Metadaten-Editor für digitale Bilder. \ - --set-key=GenericName[es] \ - --set-value=Photini editor de metadatos fotográficos \ - --set-key=Comment[es] \ - --set-value=Un editor de metadatos fotográficos fácil de usar. \ - --set-key=GenericName[fr] \ - --set-value=Éditeur de métadonnées de photos Photini \ - --set-key=Comment[fr] \ - --set-value=Une application d'édition des métadonnées des photographies numériques (Exif, IPTC, XMP) facile à utiliser. \ - --set-key=GenericName[it] \ - --set-value=Editor di metadati fotografici di Photini \ - --set-key=Comment[it] \ - --set-value=Un'applicazione di modifica dei metadati delle fotografie digitali (Exif, IPTC, XMP) facile da usare. \ - --set-key=GenericName[pl] \ - --set-value=Photini edytor metadanych zdjęcia \ - --set-key=Comment[pl] \ - --set-value=Łatwy w użyciu edytor metadanych fotografii cyfrowej. \ - /home/jim/photini/lib/python3.8/site-packages/photini/data/linux/photini.desktop + (photini) jim@mint22:~$ sudo /home/jim/photini/bin/photini-post-install + Creating /tmp/tmpkbuvvzs6/photini.desktop + Installing /tmp/tmpkbuvvzs6/photini.desktop .. code-tab:: none Windows C:\Windows\system32>c:\Users\Jim\photini\Scripts\photini-post-install.exe @@ -717,7 +597,7 @@ Before removing Photini you should use the ``photini-post-install`` command to r .. tabs:: .. code-tab:: none Linux/MacOS - (photini) jim@mint:~$ photini-post-install --remove + (photini) jim@mint22:~$ photini-post-install --remove Deleting /home/jim/.local/share/applications/photini.desktop .. code-tab:: none Windows @@ -726,6 +606,9 @@ Before removing Photini you should use the ``photini-post-install`` command to r Deleting C:\Users\Jim\AppData\Roaming\Microsoft\Windows\Start Menu\Photini\Photini.lnk Deleting C:\Users\Jim\AppData\Roaming\Microsoft\Windows\Start Menu\Photini\Photini documentation.url Deleting C:\Users\Jim\AppData\Roaming\Microsoft\Windows\Start Menu\Photini + Updating registry + Deleting HKEY_CURRENT_USER\Software\Classes\Applications\photini.exe + Deleting HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\App Paths\photini.exe If you used a virtual environment you can simply delete the top level directory created when setting up the virtual environment. Otherwise you can use pip to uninstall Photini and as many of its dependencies as you want to remove: @@ -733,24 +616,48 @@ Otherwise you can use pip to uninstall Photini and as many of its dependencies a .. tabs:: .. code-tab:: none Linux/MacOS - jim@mint:~$ pip3 uninstall photini exiv2 - Found existing installation: Photini 2023.7.0 - Uninstalling Photini-2023.7.0: + (photini) jim@mint22:~$ pip uninstall photini exiv2 + Found existing installation: Photini 2024.8.2 + Uninstalling Photini-2024.8.2: Would remove: - /home/jim/.local/bin/photini - /home/jim/.local/bin/photini-configure - /home/jim/.local/bin/photini-post-install - /home/jim/.local/lib/python3.8/site-packages/Photini-2023.7.0.dist-info/* - /home/jim/.local/lib/python3.8/site-packages/photini/* + /home/jim/photini/bin/photini + /home/jim/photini/bin/photini-configure + /home/jim/photini/bin/photini-post-install + /home/jim/photini/lib/python3.12/site-packages/Photini-2024.8.2.dist-info/* + /home/jim/photini/lib/python3.12/site-packages/photini/* Proceed (Y/n)? y - Successfully uninstalled Photini-2023.7.0 - Found existing installation: exiv2 0.14.1 - Uninstalling exiv2-0.14.1: + Successfully uninstalled Photini-2024.8.2 + Found existing installation: exiv2 0.17.0 + Uninstalling exiv2-0.17.0: Would remove: - /home/jim/.local/lib/python3.8/site-packages/exiv2-0.14.1.dist-info/* - /home/jim/.local/lib/python3.8/site-packages/exiv2/* + /home/jim/photini/lib/python3.12/site-packages/exiv2-0.17.0.dist-info/* + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libINIReader-cec0f2f5.so.0 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libbrotlicommon-6ce2a53c.so.1.0.6 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libbrotlidec-811d1be3.so.1.0.6 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libcom_err-bb8268a4.so.2.1 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libcrypt-52aca757.so.1.1.0 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libcrypto-401bea5d.so.1.1.1k + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libcurl-bbcbc527.so.4.5.0 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libgssapi_krb5-83c4f835.so.2.2 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libidn2-2f4a5893.so.0.3.6 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libinih-520f2841.so.0 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libk5crypto-99a2d4ba.so.3.1 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libkeyutils-2777d33d.so.1.6 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libkrb5-2dfb1625.so.3.3 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libkrb5support-d61d84d2.so.0.1 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/liblber-2-a32c7900.4.so.2.10.9 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libldap-2-89849551.4.so.2.10.9 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libnghttp2-15973f3b.so.14.17.0 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libpcre2-8-516f4c9d.so.0.7.1 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libpsl-99becdd3.so.5.3.1 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libsasl2-7de4d792.so.3.0.0 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libselinux-64a010fa.so.1 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libssh-8f1ecd37.so.4.8.7 + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libssl-52849bc7.so.1.1.1k + /home/jim/photini/lib/python3.12/site-packages/exiv2.libs/libunistring-05abdd40.so.2.1.0 + /home/jim/photini/lib/python3.12/site-packages/exiv2/* Proceed (Y/n)? y - Successfully uninstalled exiv2-0.14.1 + Successfully uninstalled exiv2-0.17.0 .. code-tab:: none Windows (photini) C:\Users\Jim>pip uninstall photini exiv2 @@ -781,13 +688,52 @@ If you installed Photini in a virtual environment then you need to activate the .. tabs:: .. code-tab:: none Linux/MacOS - jim@mint:~$ source photini/bin/activate - (photini) jim@mint:~$ pip3 install -U photini + jim@mint22:~$ source photini/bin/activate + (photini) jim@mint22:~$ pip install -U photini + Requirement already satisfied: photini in ./photini/lib/python3.12/site-packages (2024.5.0) + Collecting photini + Downloading Photini-2024.8.2-py3-none-any.whl.metadata (11 kB) + Requirement already satisfied: appdirs>=1.3 in ./photini/lib/python3.12/site-packages (from photini) (1.4.4) + Requirement already satisfied: cachetools>=3.0 in ./photini/lib/python3.12/site-packages (from photini) (5.5.0) + Requirement already satisfied: chardet>=3.0 in /usr/lib/python3/dist-packages (from photini) (5.2.0) + Requirement already satisfied: exiv2>=0.16 in ./photini/lib/python3.12/site-packages (from photini) (0.17.0) + Requirement already satisfied: filetype>=1.0 in /usr/lib/python3/dist-packages (from photini) (1.2.0) + Requirement already satisfied: Pillow>=2.0 in /usr/lib/python3/dist-packages (from photini) (10.2.0) + Requirement already satisfied: requests>=2.4 in /usr/lib/python3/dist-packages (from photini) (2.31.0) + Downloading Photini-2024.8.2-py3-none-any.whl (418 kB) + ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 418.1/418.1 kB 355.0 kB/s eta 0:00:00 + Installing collected packages: photini + Attempting uninstall: photini + Found existing installation: Photini 2024.5.0 + Uninstalling Photini-2024.5.0: + Successfully uninstalled Photini-2024.5.0 + Successfully installed photini-2024.8.2 .. code-tab:: none Windows C:\Users\Jim>photini\Scripts\activate.bat (photini) C:\Users\Jim>pip install -U photini + Requirement already satisfied: photini in c:\users\jim\photini\lib\site-packages (2024.5.0) + Collecting photini + Downloading Photini-2024.8.2-py3-none-any.whl.metadata (11 kB) + Requirement already satisfied: appdirs>=1.3 in c:\users\jim\photini\lib\site-packages (from photini) (1.4.4) + Requirement already satisfied: cachetools>=3.0 in c:\users\jim\photini\lib\site-packages (from photini) (5.5.0) + Requirement already satisfied: chardet>=3.0 in c:\users\jim\photini\lib\site-packages (from photini) (5.2.0) + Requirement already satisfied: exiv2>=0.16 in c:\users\jim\photini\lib\site-packages (from photini) (0.17.0) + Requirement already satisfied: filetype>=1.0 in c:\users\jim\photini\lib\site-packages (from photini) (1.2.0) + Requirement already satisfied: Pillow>=2.0 in c:\users\jim\photini\lib\site-packages (from photini) (10.4.0) + Requirement already satisfied: requests>=2.4 in c:\users\jim\photini\lib\site-packages (from photini) (2.32.3) + Requirement already satisfied: charset-normalizer<4,>=2 in c:\users\jim\photini\lib\site-packages (from requests>=2.4->photini) (3.3.2) + Requirement already satisfied: idna<4,>=2.5 in c:\users\jim\photini\lib\site-packages (from requests>=2.4->photini) (3.8) + Requirement already satisfied: urllib3<3,>=1.21.1 in c:\users\jim\photini\lib\site-packages (from requests>=2.4->photini) (2.2.3) + Requirement already satisfied: certifi>=2017.4.17 in c:\users\jim\photini\lib\site-packages (from requests>=2.4->photini) (2024.8.30) + Downloading Photini-2024.8.2-py3-none-any.whl (418 kB) + Installing collected packages: photini + Attempting uninstall: photini + Found existing installation: Photini 2024.5.0 + Uninstalling Photini-2024.5.0: + Successfully uninstalled Photini-2024.5.0 + Successfully installed photini-2024.8.2 The ``-U`` option tells pip to update Photini to the latest available version. @@ -830,11 +776,10 @@ requests_ 2.4 ``python3-requests`` [1] PyQt_, PySide2_, and PySide6_ are Python interfaces to the Qt GUI framework. Photini can use any of them (although PyQt is preferred), so you can install whichever one you prefer that is available for your operating system. (Note that PyQt6 and PySide6 are not compatible with Windows versions earlier than Windows 10.) -If more than one of them is installed you can choose which one Photini uses by editing its :ref:`configuration file ` or by running ``photini-configure``. +If more than one of them is installed you can choose which one Photini uses in its :doc:`configuration <../manual/configuration>` [2] Photini needs the Python interface to QtWebEngine_. This is included in PySide6_ and some PyQt_ or PySide2_ installations, otherwise you need to install a separate package. -The ``photini-configure`` command will tell you if it's missing. .. _installation-optional: @@ -902,27 +847,18 @@ Troubleshooting --------------- If you ever have problems running Photini the first thing to do is to run it in a command window. -If you installed Photini in a `virtual environment`_ then activate that environment, for example: +If you installed Photini in a `virtual environment`_ then activate that environment first. +Run the Photini program as a Python module. +If it fails to run you should get some diagnostic information: .. tabs:: .. code-tab:: none Linux/MacOS jim@brains:~$ source /home/jim/photini/bin/activate - (photini) jim@brains:~$ + (photini) jim@brains:~$ python3 -m photini -v .. code-tab:: none Windows - C:\Users\Jim>c:\Users\Jim\photini\Scripts\activate.bat - - (photini) C:\Users\Jim> - -Start the Photini program as follows. -If it fails to run you should get some diagnostic information: - -.. tabs:: - .. code-tab:: none Linux/MacOS - - jim@brains:~$ python3 -m photini -v - .. code-tab:: none Windows + C:\Users\Jim>photini\Scripts\activate.bat (photini) C:\Users\Jim>python -m photini -v @@ -934,27 +870,27 @@ To find out what version of Photini and some of its dependencies you are using, .. tabs:: .. code-tab:: none Linux/MacOS - (photini) jim@mint:~$ python3 -m photini --version - qt5ct: using qt5ct plugin - Photini 2023.7.0, build release - Python 3.8.10 (default, May 26 2023, 14:05:08) - [GCC 9.4.0] - python-exiv2 0.14.1, exiv2 0.27.7 - PyQt 5.14.1, Qt 5.12.8, locale en-GB + (photini) jim@mint22:~$ python -m photini --version + ffmpeg or ffprobe not found + Photini 2024.8.2 + Python 3.12.3 (main, Jul 31 2024, 17:43:48) [GCC 13.2.0] + python-exiv2 0.17.0, exiv2 0.28.3 + PyQt 5.15.10, Qt 5.15.13 + system locale en-GB, locales: en-GB en-Latn-GB en en-US en-Latn-US PyEnchant 3.2.2 - ffmpeg version 4.2.7-0ubuntu0.1 Copyright (c) 2000-2022 the FFmpeg developers - available styles: cleanlooks, gtk2, cde, motif, plastique, qt5ct-style, Windows, Fusion - using style: qt5ct-style + styles: cleanlooks, gtk2, cde, motif, plastique, Windows, Fusion + using style: fusion .. code-tab:: none Windows (photini) C:\Users\Jim>python -m photini --version ffmpeg or ffprobe not found - Photini 2023.10.0, build release + Photini 2024.8.2 Python 3.8.10 (tags/v3.8.10:3d8993a, May 3 2021, 11:48:03) [MSC v.1928 64 bit (AMD64)] - python-exiv2 0.14.1, exiv2 0.27.7 - PyQt 5.15.10, Qt 5.15.2, locale en-GB + python-exiv2 0.17.0, exiv2 0.28.3 + PyQt 5.15.11, Qt 5.15.2 + system locale en-GB, locales: en-US PyEnchant 3.2.2 - available styles: windowsvista, Windows, Fusion + styles: windowsvista, Windows, Fusion using style: windowsvista This information is useful if you need to email me (jim@jim-easterbrook.me.uk) with any problems you have running Photini. @@ -979,15 +915,20 @@ Open ``doc/html/index.html`` with a web browser to read the local documentation. .. _Exiv2: http://exiv2.org/ .. _FFmpeg: https://ffmpeg.org/ +.. _Flickr: http://www.flickr.com/ .. _GitHub releases: https://github.com/jim-easterbrook/Photini/releases +.. _Google Photos: https://photos.google.com/ .. _gpxpy: https://pypi.org/project/gpxpy/ +.. _Ipernity: http://www.ipernity.com/ .. _keyring: https://keyring.readthedocs.io/ .. _Managing Python packages the right way: https://opensource.com/article/19/4/managing-python-packages +.. _Mastodon: https://joinmastodon.org/ .. _MSYS2: http://www.msys2.org/ .. _pgi: https://pgi.readthedocs.io/ .. _Pillow: http://pillow.readthedocs.io/ .. _pip: https://pip.pypa.io/en/latest/ +.. _Pixelfed: https://pixelfed.org/ .. _PyEnchant: https://pypi.org/project/pyenchant/ .. _pyenchant documentation: https://pyenchant.github.io/pyenchant/install.html diff --git a/src/lang/ca/LC_MESSAGES/documentation.po b/src/lang/ca/LC_MESSAGES/documentation.po index 2708321c..f58918a3 100644 --- a/src/lang/ca/LC_MESSAGES/documentation.po +++ b/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-12 09:35+0100\n" +"POT-Creation-Date: 2024-09-13 10:46+0100\n" "PO-Revision-Date: 2023-04-19 08:54+0000\n" "Last-Translator: Joan , 2023\n" "Language: ca\n" @@ -2476,7 +2476,7 @@ msgid "" msgstr "" msgid "" -"Note that the command is ``python3``. On many machines the ``python`` " +"Note that the command is ``python3``. On some machines the ``python`` " "command still runs Python |nbsp| 2. If you do not have Python |nbsp| 3 " "installed then use your operating system's package manager to install it." msgstr "" @@ -2485,21 +2485,11 @@ msgid "You should also check what version of pip_ is installed::" msgstr "" msgid "" -"Most Linux systems suppress pip's normal version check, but I recommend " -"upgrading pip anyway::" -msgstr "" - -msgid "" -"Note that pip has installed the new version in ``/home/jim/.local`` as " -"normal users can't write to ``/usr``. (Don't be tempted to get round this by" -" using ``sudo`` to run pip. ``/usr/lib/python3/dist-packages`` should only " -"be written by the operating system's package manager.) You may need to log " -"out and then log in again to update your PATH settings. (On some Linux " -"distributions you can simply run ``source ~/.profile`` instead of logging " -"out & in.)" -msgstr "" - -msgid "Running ``pip --version`` again shows the new version::" +"Although pip_ is a Python package manager it should not be used to install " +"packges under ``/usr/lib/``. This system directory should only be used by " +"the operating system's package manager. With recent Python and pip versions " +"you have to use a virtual environment to install other packages such as " +"Photini." msgstr "" msgid "Windows" @@ -2606,7 +2596,8 @@ msgid "" "single user or for multiple users. Multi-user installations use a Python " "`virtual environment`_ to create a self contained installation that can " "easily be shared. Using a virtual environment has other advantages, such as " -"easy uninstallation, so I recommend using it for a single user installation." +"easy uninstallation, so I also recommend using it for a single user " +"installation." msgstr "" msgid "" @@ -2618,7 +2609,8 @@ msgid "" "installing PySide6 / PySide2 / PyQt6 / PyQt5 (whichever is available) with " "the package manager to ensure you install all of its system libraries and " "plugins, and so that you get the same GUI style as other Qt based " -"applications." +"applications. (Don't forget to install the QtWebEngine stuff as well if it's" +" in a seaprate package.)" msgstr "" msgid "Virtual environment" @@ -2632,14 +2624,16 @@ msgstr "" msgid "" "The option ``--system-site-packages`` makes packages installed with the " -"system package manager (e.g. PySide6 / PySide2 / PyQt6 / PyQt5) available " -"within the virtual environment. Note that pip may need to be updated again " -"from within the virtual environment." +"system package manager (e.g. PyQt6) available within the virtual " +"environment." msgstr "" msgid "" "Note that after activating the virtual environment the ``py`` command is not" -" needed. Python, pip, and other Python based commands are run directly. " +" needed. Python, pip, and other Python based commands are run directly." +msgstr "" + +msgid "" "After creating the virtual environment you should update ``pip`` as shown " "above. This ensures that the latest version will be used to install Photini." msgstr "" @@ -2663,40 +2657,76 @@ msgid "" msgstr "" msgid "" -"After installing Photini the ``photini-configure`` command can be used to " -"choose a Qt package. This allows you to try each until you find one that " -"works satisfactorily on your computer." +"I recommend PyQt rather than PySide, and Qt6 rather than Qt5. However, if " +"your operating system already has one of the packages installed then there's" +" probably no reason to use any other." msgstr "" -msgid "Initial installation" +msgid "" +"If you install more than one Qt package you can choose which one Photini " +"uses in its :doc:`configuration <../manual/configuration>`. This allows you " +"to try each until you find one that works satisfactorily on your computer." msgstr "" -msgid "Firstly install Photini with pip_:" +msgid "\"Extras\"" msgstr "" msgid "" -"Photini's optional dependencies can be included in the installation by " -"listing them as \"extras\" in the pip command. For example, if you want to " -"be able to upload to Flickr and Ipernity:" +"Photini has a number of optional extras that can be installed with pip_. " +"These are:" msgstr "" -msgid "Note that the extras' names are not case-sensitive." +msgid "flickr: Enable uploading pictures to Flickr_." msgstr "" -msgid "" -"You can install all of Photini's optional dependencies by adding an ``all`` " -"extra. You can also install any of the Qt packages as extras:" +msgid "google: Enable uploading pictures to `Google Photos`_." msgstr "" -msgid "" -"Now run the ``photini-configure`` command to choose which Qt package to use." -" (The Windows example is running Windows |nbsp| 7, so PyQt6 and PySide6 are " -"not available):" +msgid "ipernity: Enable uploading pictures to Ipernity_." +msgstr "" + +msgid "pixelfed: Enable uploading pictures to Pixelfed_ or Mastodon_." +msgstr "" + +msgid "importer: Import photos directly from a camera (not available on Windows)." +msgstr "" + +msgid "spelling: Install a spell checker for Photini's text entry fields." +msgstr "" + +msgid "gpxpy: Allow importing of GPS data from a phone tracking app or similar." +msgstr "" + +msgid "all: All of the above." +msgstr "" + +msgid "You can also choose to install one or more Qt packages:" +msgstr "" + +msgid "pyqt5" +msgstr "" + +msgid "pyqt6" +msgstr "" + +msgid "pyside2" +msgstr "" + +msgid "pyside6" +msgstr "" + +msgid "The extras are listed in square brackets when running pip_. For example::" +msgstr "" + +msgid "Note that the extras' names are not case sensitive." +msgstr "" + +msgid "Initial installation" msgstr "" msgid "" -"The command asks a series of questions, then runs pip_ to install any extra " -"dependencies that are needed, then updates your Photini configuration file." +"Firstly install Photini and any required extras with pip_. Make sure you " +"include at least one Qt package:" msgstr "" msgid "Test the installation" @@ -2727,9 +2757,8 @@ msgid "Optional dependencies" msgstr "" msgid "" -"Most of the dependencies required for Photini's optional features can also " -"be installed with ``photini-configure``. Default answers are given in square" -" brackets:" +"If you'd like to add any of the \"extras\" listed earlier to your Photini " +"installation, you just need to run pip_ again:" msgstr "" msgid "" @@ -2738,10 +2767,10 @@ msgid "" msgstr "" msgid "" -"One optional dependency that cannot be installed with pip_ or ``photini-" -"configure`` is FFmpeg_. This is used to read metadata from video files. " -"Linux & MacOS users can install it with the system package manager, but " -"installing it on Windows is non-trivial." +"One optional dependency that cannot be installed with pip_ is FFmpeg_. This " +"is used to read metadata from video files. Linux & MacOS users can install " +"it with the system package manager, but installing it on Windows is non-" +"trivial." msgstr "" msgid "Start menu / application menu" @@ -2774,9 +2803,9 @@ msgid "Localisation" msgstr "" msgid "" -"The ``photini-post-install`` command has a ``--language`` option that can " -"set the language used for the description that accompaines a desktop icon " -"(if Photini has been translated into that language)." +"The ``photini-post-install`` command has an option ``--language`` (or " +"``-l``) that can set the language used for the description that accompaines " +"a desktop icon (if Photini has been translated into that language)." msgstr "" msgid "Additional users" @@ -2795,9 +2824,10 @@ msgid "" msgstr "" msgid "" -"To install Photini menu shortcuts for all users you can run the post install" -" command as root (Linux) or in a command window run as administrator " -"(Windows). It is important to use the full path to the post install command:" +"To install Photini menu shortcuts for all users (not recommended) you can " +"run the post install command as root (Linux) or in a command window run as " +"administrator (Windows). It is important to use the full path to the post " +"install command:" msgstr "" msgid "Uninstalling Photini" @@ -2970,15 +3000,14 @@ msgid "" "can install whichever one you prefer that is available for your operating " "system. (Note that PyQt6 and PySide6 are not compatible with Windows " "versions earlier than Windows 10.) If more than one of them is installed you" -" can choose which one Photini uses by editing its :ref:`configuration file " -"` or by running ``photini-configure``." +" can choose which one Photini uses in its :doc:`configuration " +"<../manual/configuration>`" msgstr "" msgid "" "[2] Photini needs the Python interface to QtWebEngine_. This is included in " "PySide6_ and some PyQt_ or PySide2_ installations, otherwise you need to " -"install a separate package. The ``photini-configure`` command will tell you " -"if it's missing." +"install a separate package." msgstr "" msgid "" @@ -3105,12 +3134,8 @@ msgstr "" msgid "" "If you ever have problems running Photini the first thing to do is to run it" " in a command window. If you installed Photini in a `virtual environment`_ " -"then activate that environment, for example:" -msgstr "" - -msgid "" -"Start the Photini program as follows. If it fails to run you should get some" -" diagnostic information:" +"then activate that environment first. Run the Photini program as a Python " +"module. If it fails to run you should get some diagnostic information:" msgstr "" msgid "" @@ -4612,3 +4637,218 @@ msgstr "" #~ " wheel." #~ msgstr "" +#~ msgid "" +#~ "Note that the command is ``python3``. " +#~ "On many machines the ``python`` command " +#~ "still runs Python |nbsp| 2. If you" +#~ " do not have Python |nbsp| 3 " +#~ "installed then use your operating system's" +#~ " package manager to install it." +#~ msgstr "" + +#~ msgid "" +#~ "Most Linux systems suppress pip's normal" +#~ " version check, but I recommend " +#~ "upgrading pip anyway::" +#~ msgstr "" + +#~ msgid "" +#~ "Note that pip has installed the new" +#~ " version in ``/home/jim/.local`` as normal " +#~ "users can't write to ``/usr``. (Don't " +#~ "be tempted to get round this by " +#~ "using ``sudo`` to run pip. " +#~ "``/usr/lib/python3/dist-packages`` should only be" +#~ " written by the operating system's " +#~ "package manager.) You may need to log" +#~ " out and then log in again to " +#~ "update your PATH settings. (On some " +#~ "Linux distributions you can simply run " +#~ "``source ~/.profile`` instead of logging " +#~ "out & in.)" +#~ msgstr "" + +#~ msgid "Running ``pip --version`` again shows the new version::" +#~ msgstr "" + +#~ msgid "" +#~ "Before installing Photini you need to " +#~ "decide if you are installing it for" +#~ " a single user or for multiple " +#~ "users. Multi-user installations use a " +#~ "Python `virtual environment`_ to create a" +#~ " self contained installation that can " +#~ "easily be shared. Using a virtual " +#~ "environment has other advantages, such as" +#~ " easy uninstallation, so I recommend " +#~ "using it for a single user " +#~ "installation." +#~ msgstr "" + +#~ msgid "" +#~ "Linux & MacOS users have another " +#~ "decision to make - whether to install" +#~ " Photini's dependencies with pip_ or " +#~ "with the operating system's package " +#~ "manager. For a good introduction to " +#~ "the advantages and disadvantages of each" +#~ " I suggest reading `Managing Python " +#~ "packages the right way`_. All of " +#~ "Photini's dependencies can be installed " +#~ "with pip_, but I recommend installing " +#~ "PySide6 / PySide2 / PyQt6 / PyQt5 " +#~ "(whichever is available) with the package" +#~ " manager to ensure you install all " +#~ "of its system libraries and plugins, " +#~ "and so that you get the same " +#~ "GUI style as other Qt based " +#~ "applications." +#~ msgstr "" + +#~ msgid "" +#~ "The option ``--system-site-packages`` makes" +#~ " packages installed with the system " +#~ "package manager (e.g. PySide6 / PySide2 " +#~ "/ PyQt6 / PyQt5) available within the" +#~ " virtual environment. Note that pip may" +#~ " need to be updated again from " +#~ "within the virtual environment." +#~ msgstr "" + +#~ msgid "" +#~ "Note that after activating the virtual " +#~ "environment the ``py`` command is not " +#~ "needed. Python, pip, and other Python " +#~ "based commands are run directly. After " +#~ "creating the virtual environment you should" +#~ " update ``pip`` as shown above. This " +#~ "ensures that the latest version will " +#~ "be used to install Photini." +#~ msgstr "" + +#~ msgid "" +#~ "After installing Photini the ``photini-" +#~ "configure`` command can be used to " +#~ "choose a Qt package. This allows you" +#~ " to try each until you find one" +#~ " that works satisfactorily on your " +#~ "computer." +#~ msgstr "" + +#~ msgid "Firstly install Photini with pip_:" +#~ msgstr "" + +#~ msgid "" +#~ "Photini's optional dependencies can be " +#~ "included in the installation by listing " +#~ "them as \"extras\" in the pip " +#~ "command. For example, if you want to" +#~ " be able to upload to Flickr and" +#~ " Ipernity:" +#~ msgstr "" + +#~ msgid "Note that the extras' names are not case-sensitive." +#~ msgstr "" + +#~ msgid "" +#~ "You can install all of Photini's " +#~ "optional dependencies by adding an ``all``" +#~ " extra. You can also install any " +#~ "of the Qt packages as extras:" +#~ msgstr "" + +#~ msgid "" +#~ "Now run the ``photini-configure`` command" +#~ " to choose which Qt package to " +#~ "use. (The Windows example is running " +#~ "Windows |nbsp| 7, so PyQt6 and " +#~ "PySide6 are not available):" +#~ msgstr "" + +#~ msgid "" +#~ "The command asks a series of " +#~ "questions, then runs pip_ to install " +#~ "any extra dependencies that are needed, " +#~ "then updates your Photini configuration " +#~ "file." +#~ msgstr "" + +#~ msgid "" +#~ "Most of the dependencies required for " +#~ "Photini's optional features can also be " +#~ "installed with ``photini-configure``. Default " +#~ "answers are given in square brackets:" +#~ msgstr "" + +#~ msgid "" +#~ "One optional dependency that cannot be " +#~ "installed with pip_ or ``photini-" +#~ "configure`` is FFmpeg_. This is used " +#~ "to read metadata from video files. " +#~ "Linux & MacOS users can install it" +#~ " with the system package manager, but" +#~ " installing it on Windows is non-" +#~ "trivial." +#~ msgstr "" + +#~ msgid "" +#~ "The ``photini-post-install`` command has" +#~ " a ``--language`` option that can set" +#~ " the language used for the description" +#~ " that accompaines a desktop icon (if " +#~ "Photini has been translated into that " +#~ "language)." +#~ msgstr "" + +#~ msgid "" +#~ "To install Photini menu shortcuts for " +#~ "all users you can run the post " +#~ "install command as root (Linux) or in" +#~ " a command window run as administrator" +#~ " (Windows). It is important to use " +#~ "the full path to the post install " +#~ "command:" +#~ msgstr "" + +#~ msgid "" +#~ "[1] PyQt_, PySide2_, and PySide6_ are " +#~ "Python interfaces to the Qt GUI " +#~ "framework. Photini can use any of " +#~ "them (although PyQt is preferred), so " +#~ "you can install whichever one you " +#~ "prefer that is available for your " +#~ "operating system. (Note that PyQt6 and " +#~ "PySide6 are not compatible with Windows " +#~ "versions earlier than Windows 10.) If " +#~ "more than one of them is installed" +#~ " you can choose which one Photini " +#~ "uses by editing its :ref:`configuration " +#~ "file ` or by running" +#~ " ``photini-configure``." +#~ msgstr "" + +#~ msgid "" +#~ "[2] Photini needs the Python interface " +#~ "to QtWebEngine_. This is included in " +#~ "PySide6_ and some PyQt_ or PySide2_ " +#~ "installations, otherwise you need to " +#~ "install a separate package. The " +#~ "``photini-configure`` command will tell you" +#~ " if it's missing." +#~ msgstr "" + +#~ msgid "" +#~ "If you ever have problems running " +#~ "Photini the first thing to do is " +#~ "to run it in a command window. " +#~ "If you installed Photini in a " +#~ "`virtual environment`_ then activate that " +#~ "environment, for example:" +#~ msgstr "" + +#~ msgid "" +#~ "Start the Photini program as follows. " +#~ "If it fails to run you should " +#~ "get some diagnostic information:" +#~ msgstr "" + diff --git a/src/lang/cs/LC_MESSAGES/documentation.po b/src/lang/cs/LC_MESSAGES/documentation.po index 01108b59..da9f9c20 100644 --- a/src/lang/cs/LC_MESSAGES/documentation.po +++ b/src/lang/cs/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-12 09:35+0100\n" +"POT-Creation-Date: 2024-09-13 10:46+0100\n" "PO-Revision-Date: 2023-04-19 08:54+0000\n" "Last-Translator: fri, 2023\n" "Language: cs@qtfiletype\n" @@ -2479,8 +2479,9 @@ msgstr "" "Python by již měl být nainstalován, ale ujistěte se, že máte Python |nbsp| " "3. Otevřete okno terminálu a spusťte příkaz ``python3``::" +#, fuzzy msgid "" -"Note that the command is ``python3``. On many machines the ``python`` " +"Note that the command is ``python3``. On some machines the ``python`` " "command still runs Python |nbsp| 2. If you do not have Python |nbsp| 3 " "installed then use your operating system's package manager to install it." msgstr "" @@ -2492,31 +2493,12 @@ msgid "You should also check what version of pip_ is installed::" msgstr "Měli byste také zkontrolovat, jaká verze pip_ je nainstalována::" msgid "" -"Most Linux systems suppress pip's normal version check, but I recommend " -"upgrading pip anyway::" -msgstr "" -"Většina linuxových systémů potlačuje běžnou kontrolu verze pipu, ale přesto " -"doporučuji pip aktualizovat::" - -#, fuzzy -msgid "" -"Note that pip has installed the new version in ``/home/jim/.local`` as " -"normal users can't write to ``/usr``. (Don't be tempted to get round this by" -" using ``sudo`` to run pip. ``/usr/lib/python3/dist-packages`` should only " -"be written by the operating system's package manager.) You may need to log " -"out and then log in again to update your PATH settings. (On some Linux " -"distributions you can simply run ``source ~/.profile`` instead of logging " -"out & in.)" +"Although pip_ is a Python package manager it should not be used to install " +"packges under ``/usr/lib/``. This system directory should only be used by " +"the operating system's package manager. With recent Python and pip versions " +"you have to use a virtual environment to install other packages such as " +"Photini." msgstr "" -"Všimněte si, že pip nainstaloval novou verzi do adresáře " -"``/home/jim/.local``, protože běžní uživatelé nemohou zapisovat do adresáře " -"``/usr``. (Nepodléhejte pokušení obejít to použitím ``sudo`` pro spuštění " -"pipu. Do ``/usr`` by měl zapisovat pouze správce balíčků operačního " -"systému.) Možná se budete muset odhlásit a znovu přihlásit, abyste " -"aktualizovali nastavení PATH." - -msgid "Running ``pip --version`` again shows the new version::" -msgstr "Při opětovném spuštění ``pip --version`` se zobrazí nová verze::" msgid "Windows" msgstr "Windows" @@ -2636,7 +2618,8 @@ msgid "" "single user or for multiple users. Multi-user installations use a Python " "`virtual environment`_ to create a self contained installation that can " "easily be shared. Using a virtual environment has other advantages, such as " -"easy uninstallation, so I recommend using it for a single user installation." +"easy uninstallation, so I also recommend using it for a single user " +"installation." msgstr "" "Před instalací aplikace Photini se musíte rozhodnout, zda ji instalujete pro" " jednoho uživatele, nebo pro více uživatelů. Instalace pro více uživatelů " @@ -2654,7 +2637,8 @@ msgid "" "installing PySide6 / PySide2 / PyQt6 / PyQt5 (whichever is available) with " "the package manager to ensure you install all of its system libraries and " "plugins, and so that you get the same GUI style as other Qt based " -"applications." +"applications. (Don't forget to install the QtWebEngine stuff as well if it's" +" in a seaprate package.)" msgstr "" msgid "Virtual environment" @@ -2671,14 +2655,16 @@ msgstr "" msgid "" "The option ``--system-site-packages`` makes packages installed with the " -"system package manager (e.g. PySide6 / PySide2 / PyQt6 / PyQt5) available " -"within the virtual environment. Note that pip may need to be updated again " -"from within the virtual environment." +"system package manager (e.g. PyQt6) available within the virtual " +"environment." msgstr "" msgid "" "Note that after activating the virtual environment the ``py`` command is not" -" needed. Python, pip, and other Python based commands are run directly. " +" needed. Python, pip, and other Python based commands are run directly." +msgstr "" + +msgid "" "After creating the virtual environment you should update ``pip`` as shown " "above. This ensures that the latest version will be used to install Photini." msgstr "" @@ -2703,40 +2689,78 @@ msgid "" msgstr "" msgid "" -"After installing Photini the ``photini-configure`` command can be used to " -"choose a Qt package. This allows you to try each until you find one that " -"works satisfactorily on your computer." +"I recommend PyQt rather than PySide, and Qt6 rather than Qt5. However, if " +"your operating system already has one of the packages installed then there's" +" probably no reason to use any other." msgstr "" -msgid "Initial installation" +msgid "" +"If you install more than one Qt package you can choose which one Photini " +"uses in its :doc:`configuration <../manual/configuration>`. This allows you " +"to try each until you find one that works satisfactorily on your computer." msgstr "" -msgid "Firstly install Photini with pip_:" +msgid "\"Extras\"" msgstr "" msgid "" -"Photini's optional dependencies can be included in the installation by " -"listing them as \"extras\" in the pip command. For example, if you want to " -"be able to upload to Flickr and Ipernity:" +"Photini has a number of optional extras that can be installed with pip_. " +"These are:" msgstr "" -msgid "Note that the extras' names are not case-sensitive." +msgid "flickr: Enable uploading pictures to Flickr_." msgstr "" -msgid "" -"You can install all of Photini's optional dependencies by adding an ``all`` " -"extra. You can also install any of the Qt packages as extras:" +msgid "google: Enable uploading pictures to `Google Photos`_." msgstr "" -msgid "" -"Now run the ``photini-configure`` command to choose which Qt package to use." -" (The Windows example is running Windows |nbsp| 7, so PyQt6 and PySide6 are " -"not available):" +msgid "ipernity: Enable uploading pictures to Ipernity_." +msgstr "" + +msgid "pixelfed: Enable uploading pictures to Pixelfed_ or Mastodon_." +msgstr "" + +msgid "importer: Import photos directly from a camera (not available on Windows)." +msgstr "" + +msgid "spelling: Install a spell checker for Photini's text entry fields." +msgstr "" + +msgid "gpxpy: Allow importing of GPS data from a phone tracking app or similar." +msgstr "" + +msgid "all: All of the above." +msgstr "" + +msgid "You can also choose to install one or more Qt packages:" +msgstr "" + +msgid "pyqt5" +msgstr "" + +msgid "pyqt6" +msgstr "" + +#, fuzzy +msgid "pyside2" +msgstr "PySide2" + +#, fuzzy +msgid "pyside6" +msgstr "PySide6" + +msgid "The extras are listed in square brackets when running pip_. For example::" +msgstr "" + +msgid "Note that the extras' names are not case sensitive." +msgstr "" + +msgid "Initial installation" msgstr "" msgid "" -"The command asks a series of questions, then runs pip_ to install any extra " -"dependencies that are needed, then updates your Photini configuration file." +"Firstly install Photini and any required extras with pip_. Make sure you " +"include at least one Qt package:" msgstr "" msgid "Test the installation" @@ -2770,9 +2794,8 @@ msgid "Optional dependencies" msgstr "Volitelné závislosti" msgid "" -"Most of the dependencies required for Photini's optional features can also " -"be installed with ``photini-configure``. Default answers are given in square" -" brackets:" +"If you'd like to add any of the \"extras\" listed earlier to your Photini " +"installation, you just need to run pip_ again:" msgstr "" msgid "" @@ -2784,10 +2807,10 @@ msgstr "" "`pyenchant`_." msgid "" -"One optional dependency that cannot be installed with pip_ or ``photini-" -"configure`` is FFmpeg_. This is used to read metadata from video files. " -"Linux & MacOS users can install it with the system package manager, but " -"installing it on Windows is non-trivial." +"One optional dependency that cannot be installed with pip_ is FFmpeg_. This " +"is used to read metadata from video files. Linux & MacOS users can install " +"it with the system package manager, but installing it on Windows is non-" +"trivial." msgstr "" msgid "Start menu / application menu" @@ -2825,9 +2848,9 @@ msgid "Localisation" msgstr "" msgid "" -"The ``photini-post-install`` command has a ``--language`` option that can " -"set the language used for the description that accompaines a desktop icon " -"(if Photini has been translated into that language)." +"The ``photini-post-install`` command has an option ``--language`` (or " +"``-l``) that can set the language used for the description that accompaines " +"a desktop icon (if Photini has been translated into that language)." msgstr "" msgid "Additional users" @@ -2853,10 +2876,12 @@ msgstr "" "To není příliš pohodlný způsob spouštění aplikace Photini, takže většina " "uživatelů si ji bude chtít přidat do nabídky Start/Aplikace:" +#, fuzzy msgid "" -"To install Photini menu shortcuts for all users you can run the post install" -" command as root (Linux) or in a command window run as administrator " -"(Windows). It is important to use the full path to the post install command:" +"To install Photini menu shortcuts for all users (not recommended) you can " +"run the post install command as root (Linux) or in a command window run as " +"administrator (Windows). It is important to use the full path to the post " +"install command:" msgstr "" "Chcete-li nainstalovat zástupce nabídky Photini pro všechny uživatele, " "můžete spustit příkaz po instalaci jako root (Linux) nebo v příkazovém okně " @@ -3056,15 +3081,14 @@ msgid "" "can install whichever one you prefer that is available for your operating " "system. (Note that PyQt6 and PySide6 are not compatible with Windows " "versions earlier than Windows 10.) If more than one of them is installed you" -" can choose which one Photini uses by editing its :ref:`configuration file " -"` or by running ``photini-configure``." +" can choose which one Photini uses in its :doc:`configuration " +"<../manual/configuration>`" msgstr "" msgid "" "[2] Photini needs the Python interface to QtWebEngine_. This is included in " "PySide6_ and some PyQt_ or PySide2_ installations, otherwise you need to " -"install a separate package. The ``photini-configure`` command will tell you " -"if it's missing." +"install a separate package." msgstr "" msgid "" @@ -3203,12 +3227,8 @@ msgstr "" msgid "" "If you ever have problems running Photini the first thing to do is to run it" " in a command window. If you installed Photini in a `virtual environment`_ " -"then activate that environment, for example:" -msgstr "" - -msgid "" -"Start the Photini program as follows. If it fails to run you should get some" -" diagnostic information:" +"then activate that environment first. Run the Photini program as a Python " +"module. If it fails to run you should get some diagnostic information:" msgstr "" msgid "" @@ -4618,3 +4638,197 @@ msgstr "" #~ " wheel." #~ msgstr "" +#~ msgid "" +#~ "Most Linux systems suppress pip's normal" +#~ " version check, but I recommend " +#~ "upgrading pip anyway::" +#~ msgstr "" +#~ "Většina linuxových systémů potlačuje běžnou " +#~ "kontrolu verze pipu, ale přesto doporučuji" +#~ " pip aktualizovat::" + +#~ msgid "" +#~ "Note that pip has installed the new" +#~ " version in ``/home/jim/.local`` as normal " +#~ "users can't write to ``/usr``. (Don't " +#~ "be tempted to get round this by " +#~ "using ``sudo`` to run pip. " +#~ "``/usr/lib/python3/dist-packages`` should only be" +#~ " written by the operating system's " +#~ "package manager.) You may need to log" +#~ " out and then log in again to " +#~ "update your PATH settings. (On some " +#~ "Linux distributions you can simply run " +#~ "``source ~/.profile`` instead of logging " +#~ "out & in.)" +#~ msgstr "" +#~ "Všimněte si, že pip nainstaloval novou " +#~ "verzi do adresáře ``/home/jim/.local``, protože" +#~ " běžní uživatelé nemohou zapisovat do " +#~ "adresáře ``/usr``. (Nepodléhejte pokušení obejít" +#~ " to použitím ``sudo`` pro spuštění pipu." +#~ " Do ``/usr`` by měl zapisovat pouze " +#~ "správce balíčků operačního systému.) Možná " +#~ "se budete muset odhlásit a znovu " +#~ "přihlásit, abyste aktualizovali nastavení PATH." + +#~ msgid "Running ``pip --version`` again shows the new version::" +#~ msgstr "Při opětovném spuštění ``pip --version`` se zobrazí nová verze::" + +#~ msgid "" +#~ "Linux & MacOS users have another " +#~ "decision to make - whether to install" +#~ " Photini's dependencies with pip_ or " +#~ "with the operating system's package " +#~ "manager. For a good introduction to " +#~ "the advantages and disadvantages of each" +#~ " I suggest reading `Managing Python " +#~ "packages the right way`_. All of " +#~ "Photini's dependencies can be installed " +#~ "with pip_, but I recommend installing " +#~ "PySide6 / PySide2 / PyQt6 / PyQt5 " +#~ "(whichever is available) with the package" +#~ " manager to ensure you install all " +#~ "of its system libraries and plugins, " +#~ "and so that you get the same " +#~ "GUI style as other Qt based " +#~ "applications." +#~ msgstr "" + +#~ msgid "" +#~ "The option ``--system-site-packages`` makes" +#~ " packages installed with the system " +#~ "package manager (e.g. PySide6 / PySide2 " +#~ "/ PyQt6 / PyQt5) available within the" +#~ " virtual environment. Note that pip may" +#~ " need to be updated again from " +#~ "within the virtual environment." +#~ msgstr "" + +#~ msgid "" +#~ "Note that after activating the virtual " +#~ "environment the ``py`` command is not " +#~ "needed. Python, pip, and other Python " +#~ "based commands are run directly. After " +#~ "creating the virtual environment you should" +#~ " update ``pip`` as shown above. This " +#~ "ensures that the latest version will " +#~ "be used to install Photini." +#~ msgstr "" + +#~ msgid "" +#~ "After installing Photini the ``photini-" +#~ "configure`` command can be used to " +#~ "choose a Qt package. This allows you" +#~ " to try each until you find one" +#~ " that works satisfactorily on your " +#~ "computer." +#~ msgstr "" + +#~ msgid "Firstly install Photini with pip_:" +#~ msgstr "" + +#~ msgid "" +#~ "Photini's optional dependencies can be " +#~ "included in the installation by listing " +#~ "them as \"extras\" in the pip " +#~ "command. For example, if you want to" +#~ " be able to upload to Flickr and" +#~ " Ipernity:" +#~ msgstr "" + +#~ msgid "Note that the extras' names are not case-sensitive." +#~ msgstr "" + +#~ msgid "" +#~ "You can install all of Photini's " +#~ "optional dependencies by adding an ``all``" +#~ " extra. You can also install any " +#~ "of the Qt packages as extras:" +#~ msgstr "" + +#~ msgid "" +#~ "Now run the ``photini-configure`` command" +#~ " to choose which Qt package to " +#~ "use. (The Windows example is running " +#~ "Windows |nbsp| 7, so PyQt6 and " +#~ "PySide6 are not available):" +#~ msgstr "" + +#~ msgid "" +#~ "The command asks a series of " +#~ "questions, then runs pip_ to install " +#~ "any extra dependencies that are needed, " +#~ "then updates your Photini configuration " +#~ "file." +#~ msgstr "" + +#~ msgid "" +#~ "Most of the dependencies required for " +#~ "Photini's optional features can also be " +#~ "installed with ``photini-configure``. Default " +#~ "answers are given in square brackets:" +#~ msgstr "" + +#~ msgid "" +#~ "One optional dependency that cannot be " +#~ "installed with pip_ or ``photini-" +#~ "configure`` is FFmpeg_. This is used " +#~ "to read metadata from video files. " +#~ "Linux & MacOS users can install it" +#~ " with the system package manager, but" +#~ " installing it on Windows is non-" +#~ "trivial." +#~ msgstr "" + +#~ msgid "" +#~ "The ``photini-post-install`` command has" +#~ " a ``--language`` option that can set" +#~ " the language used for the description" +#~ " that accompaines a desktop icon (if " +#~ "Photini has been translated into that " +#~ "language)." +#~ msgstr "" + +#~ msgid "" +#~ "[1] PyQt_, PySide2_, and PySide6_ are " +#~ "Python interfaces to the Qt GUI " +#~ "framework. Photini can use any of " +#~ "them (although PyQt is preferred), so " +#~ "you can install whichever one you " +#~ "prefer that is available for your " +#~ "operating system. (Note that PyQt6 and " +#~ "PySide6 are not compatible with Windows " +#~ "versions earlier than Windows 10.) If " +#~ "more than one of them is installed" +#~ " you can choose which one Photini " +#~ "uses by editing its :ref:`configuration " +#~ "file ` or by running" +#~ " ``photini-configure``." +#~ msgstr "" + +#~ msgid "" +#~ "[2] Photini needs the Python interface " +#~ "to QtWebEngine_. This is included in " +#~ "PySide6_ and some PyQt_ or PySide2_ " +#~ "installations, otherwise you need to " +#~ "install a separate package. The " +#~ "``photini-configure`` command will tell you" +#~ " if it's missing." +#~ msgstr "" + +#~ msgid "" +#~ "If you ever have problems running " +#~ "Photini the first thing to do is " +#~ "to run it in a command window. " +#~ "If you installed Photini in a " +#~ "`virtual environment`_ then activate that " +#~ "environment, for example:" +#~ msgstr "" + +#~ msgid "" +#~ "Start the Photini program as follows. " +#~ "If it fails to run you should " +#~ "get some diagnostic information:" +#~ msgstr "" + diff --git a/src/lang/de/LC_MESSAGES/documentation.po b/src/lang/de/LC_MESSAGES/documentation.po index 63fa3984..127d9b25 100644 --- a/src/lang/de/LC_MESSAGES/documentation.po +++ b/src/lang/de/LC_MESSAGES/documentation.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Photini 2023.4.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-09-12 09:35+0100\n" +"POT-Creation-Date: 2024-09-13 10:46+0100\n" "PO-Revision-Date: 2023-04-19 08:54+0000\n" "Last-Translator: Jim Easterbrook , 2023\n" "Language: de\n" @@ -2470,7 +2470,7 @@ msgid "" msgstr "" msgid "" -"Note that the command is ``python3``. On many machines the ``python`` " +"Note that the command is ``python3``. On some machines the ``python`` " "command still runs Python |nbsp| 2. If you do not have Python |nbsp| 3 " "installed then use your operating system's package manager to install it." msgstr "" @@ -2479,21 +2479,11 @@ msgid "You should also check what version of pip_ is installed::" msgstr "" msgid "" -"Most Linux systems suppress pip's normal version check, but I recommend " -"upgrading pip anyway::" -msgstr "" - -msgid "" -"Note that pip has installed the new version in ``/home/jim/.local`` as " -"normal users can't write to ``/usr``. (Don't be tempted to get round this by" -" using ``sudo`` to run pip. ``/usr/lib/python3/dist-packages`` should only " -"be written by the operating system's package manager.) You may need to log " -"out and then log in again to update your PATH settings. (On some Linux " -"distributions you can simply run ``source ~/.profile`` instead of logging " -"out & in.)" -msgstr "" - -msgid "Running ``pip --version`` again shows the new version::" +"Although pip_ is a Python package manager it should not be used to install " +"packges under ``/usr/lib/``. This system directory should only be used by " +"the operating system's package manager. With recent Python and pip versions " +"you have to use a virtual environment to install other packages such as " +"Photini." msgstr "" msgid "Windows" @@ -2600,7 +2590,8 @@ msgid "" "single user or for multiple users. Multi-user installations use a Python " "`virtual environment`_ to create a self contained installation that can " "easily be shared. Using a virtual environment has other advantages, such as " -"easy uninstallation, so I recommend using it for a single user installation." +"easy uninstallation, so I also recommend using it for a single user " +"installation." msgstr "" msgid "" @@ -2612,7 +2603,8 @@ msgid "" "installing PySide6 / PySide2 / PyQt6 / PyQt5 (whichever is available) with " "the package manager to ensure you install all of its system libraries and " "plugins, and so that you get the same GUI style as other Qt based " -"applications." +"applications. (Don't forget to install the QtWebEngine stuff as well if it's" +" in a seaprate package.)" msgstr "" msgid "Virtual environment" @@ -2626,14 +2618,16 @@ msgstr "" msgid "" "The option ``--system-site-packages`` makes packages installed with the " -"system package manager (e.g. PySide6 / PySide2 / PyQt6 / PyQt5) available " -"within the virtual environment. Note that pip may need to be updated again " -"from within the virtual environment." +"system package manager (e.g. PyQt6) available within the virtual " +"environment." msgstr "" msgid "" "Note that after activating the virtual environment the ``py`` command is not" -" needed. Python, pip, and other Python based commands are run directly. " +" needed. Python, pip, and other Python based commands are run directly." +msgstr "" + +msgid "" "After creating the virtual environment you should update ``pip`` as shown " "above. This ensures that the latest version will be used to install Photini." msgstr "" @@ -2658,40 +2652,78 @@ msgid "" msgstr "" msgid "" -"After installing Photini the ``photini-configure`` command can be used to " -"choose a Qt package. This allows you to try each until you find one that " -"works satisfactorily on your computer." +"I recommend PyQt rather than PySide, and Qt6 rather than Qt5. However, if " +"your operating system already has one of the packages installed then there's" +" probably no reason to use any other." msgstr "" -msgid "Initial installation" -msgstr "Erstinstallation" +msgid "" +"If you install more than one Qt package you can choose which one Photini " +"uses in its :doc:`configuration <../manual/configuration>`. This allows you " +"to try each until you find one that works satisfactorily on your computer." +msgstr "" -msgid "Firstly install Photini with pip_:" +msgid "\"Extras\"" msgstr "" msgid "" -"Photini's optional dependencies can be included in the installation by " -"listing them as \"extras\" in the pip command. For example, if you want to " -"be able to upload to Flickr and Ipernity:" +"Photini has a number of optional extras that can be installed with pip_. " +"These are:" msgstr "" -msgid "Note that the extras' names are not case-sensitive." +msgid "flickr: Enable uploading pictures to Flickr_." msgstr "" -msgid "" -"You can install all of Photini's optional dependencies by adding an ``all`` " -"extra. You can also install any of the Qt packages as extras:" +msgid "google: Enable uploading pictures to `Google Photos`_." msgstr "" -msgid "" -"Now run the ``photini-configure`` command to choose which Qt package to use." -" (The Windows example is running Windows |nbsp| 7, so PyQt6 and PySide6 are " -"not available):" +msgid "ipernity: Enable uploading pictures to Ipernity_." +msgstr "" + +msgid "pixelfed: Enable uploading pictures to Pixelfed_ or Mastodon_." +msgstr "" + +msgid "importer: Import photos directly from a camera (not available on Windows)." msgstr "" +msgid "spelling: Install a spell checker for Photini's text entry fields." +msgstr "" + +msgid "gpxpy: Allow importing of GPS data from a phone tracking app or similar." +msgstr "" + +msgid "all: All of the above." +msgstr "" + +msgid "You can also choose to install one or more Qt packages:" +msgstr "" + +msgid "pyqt5" +msgstr "" + +msgid "pyqt6" +msgstr "" + +#, fuzzy +msgid "pyside2" +msgstr "PySide2" + +#, fuzzy +msgid "pyside6" +msgstr "PySide6" + +msgid "The extras are listed in square brackets when running pip_. For example::" +msgstr "" + +msgid "Note that the extras' names are not case sensitive." +msgstr "" + +msgid "Initial installation" +msgstr "Erstinstallation" + msgid "" -"The command asks a series of questions, then runs pip_ to install any extra " -"dependencies that are needed, then updates your Photini configuration file." +"Firstly install Photini and any required extras with pip_. Make sure you " +"include at least one Qt package:" msgstr "" msgid "Test the installation" @@ -2722,9 +2754,8 @@ msgid "Optional dependencies" msgstr "Optionale Abhängigkeiten" msgid "" -"Most of the dependencies required for Photini's optional features can also " -"be installed with ``photini-configure``. Default answers are given in square" -" brackets:" +"If you'd like to add any of the \"extras\" listed earlier to your Photini " +"installation, you just need to run pip_ again:" msgstr "" msgid "" @@ -2733,10 +2764,10 @@ msgid "" msgstr "" msgid "" -"One optional dependency that cannot be installed with pip_ or ``photini-" -"configure`` is FFmpeg_. This is used to read metadata from video files. " -"Linux & MacOS users can install it with the system package manager, but " -"installing it on Windows is non-trivial." +"One optional dependency that cannot be installed with pip_ is FFmpeg_. This " +"is used to read metadata from video files. Linux & MacOS users can install " +"it with the system package manager, but installing it on Windows is non-" +"trivial." msgstr "" msgid "Start menu / application menu" @@ -2770,9 +2801,9 @@ msgid "Localisation" msgstr "Lokalisierung" msgid "" -"The ``photini-post-install`` command has a ``--language`` option that can " -"set the language used for the description that accompaines a desktop icon " -"(if Photini has been translated into that language)." +"The ``photini-post-install`` command has an option ``--language`` (or " +"``-l``) that can set the language used for the description that accompaines " +"a desktop icon (if Photini has been translated into that language)." msgstr "" msgid "Additional users" @@ -2791,9 +2822,10 @@ msgid "" msgstr "" msgid "" -"To install Photini menu shortcuts for all users you can run the post install" -" command as root (Linux) or in a command window run as administrator " -"(Windows). It is important to use the full path to the post install command:" +"To install Photini menu shortcuts for all users (not recommended) you can " +"run the post install command as root (Linux) or in a command window run as " +"administrator (Windows). It is important to use the full path to the post " +"install command:" msgstr "" msgid "Uninstalling Photini" @@ -2968,15 +3000,14 @@ msgid "" "can install whichever one you prefer that is available for your operating " "system. (Note that PyQt6 and PySide6 are not compatible with Windows " "versions earlier than Windows 10.) If more than one of them is installed you" -" can choose which one Photini uses by editing its :ref:`configuration file " -"` or by running ``photini-configure``." +" can choose which one Photini uses in its :doc:`configuration " +"<../manual/configuration>`" msgstr "" msgid "" "[2] Photini needs the Python interface to QtWebEngine_. This is included in " "PySide6_ and some PyQt_ or PySide2_ installations, otherwise you need to " -"install a separate package. The ``photini-configure`` command will tell you " -"if it's missing." +"install a separate package." msgstr "" msgid "" @@ -3103,12 +3134,8 @@ msgstr "Fehlersuche" msgid "" "If you ever have problems running Photini the first thing to do is to run it" " in a command window. If you installed Photini in a `virtual environment`_ " -"then activate that environment, for example:" -msgstr "" - -msgid "" -"Start the Photini program as follows. If it fails to run you should get some" -" diagnostic information:" +"then activate that environment first. Run the Photini program as a Python " +"module. If it fails to run you should get some diagnostic information:" msgstr "" msgid "" @@ -4608,3 +4635,218 @@ msgstr "" #~ " wheel." #~ msgstr "" +#~ msgid "" +#~ "Note that the command is ``python3``. " +#~ "On many machines the ``python`` command " +#~ "still runs Python |nbsp| 2. If you" +#~ " do not have Python |nbsp| 3 " +#~ "installed then use your operating system's" +#~ " package manager to install it." +#~ msgstr "" + +#~ msgid "" +#~ "Most Linux systems suppress pip's normal" +#~ " version check, but I recommend " +#~ "upgrading pip anyway::" +#~ msgstr "" + +#~ msgid "" +#~ "Note that pip has installed the new" +#~ " version in ``/home/jim/.local`` as normal " +#~ "users can't write to ``/usr``. (Don't " +#~ "be tempted to get round this by " +#~ "using ``sudo`` to run pip. " +#~ "``/usr/lib/python3/dist-packages`` should only be" +#~ " written by the operating system's " +#~ "package manager.) You may need to log" +#~ " out and then log in again to " +#~ "update your PATH settings. (On some " +#~ "Linux distributions you can simply run " +#~ "``source ~/.profile`` instead of logging " +#~ "out & in.)" +#~ msgstr "" + +#~ msgid "Running ``pip --version`` again shows the new version::" +#~ msgstr "" + +#~ msgid "" +#~ "Before installing Photini you need to " +#~ "decide if you are installing it for" +#~ " a single user or for multiple " +#~ "users. Multi-user installations use a " +#~ "Python `virtual environment`_ to create a" +#~ " self contained installation that can " +#~ "easily be shared. Using a virtual " +#~ "environment has other advantages, such as" +#~ " easy uninstallation, so I recommend " +#~ "using it for a single user " +#~ "installation." +#~ msgstr "" + +#~ msgid "" +#~ "Linux & MacOS users have another " +#~ "decision to make - whether to install" +#~ " Photini's dependencies with pip_ or " +#~ "with the operating system's package " +#~ "manager. For a good introduction to " +#~ "the advantages and disadvantages of each" +#~ " I suggest reading `Managing Python " +#~ "packages the right way`_. All of " +#~ "Photini's dependencies can be installed " +#~ "with pip_, but I recommend installing " +#~ "PySide6 / PySide2 / PyQt6 / PyQt5 " +#~ "(whichever is available) with the package" +#~ " manager to ensure you install all " +#~ "of its system libraries and plugins, " +#~ "and so that you get the same " +#~ "GUI style as other Qt based " +#~ "applications." +#~ msgstr "" + +#~ msgid "" +#~ "The option ``--system-site-packages`` makes" +#~ " packages installed with the system " +#~ "package manager (e.g. PySide6 / PySide2 " +#~ "/ PyQt6 / PyQt5) available within the" +#~ " virtual environment. Note that pip may" +#~ " need to be updated again from " +#~ "within the virtual environment." +#~ msgstr "" + +#~ msgid "" +#~ "Note that after activating the virtual " +#~ "environment the ``py`` command is not " +#~ "needed. Python, pip, and other Python " +#~ "based commands are run directly. After " +#~ "creating the virtual environment you should" +#~ " update ``pip`` as shown above. This " +#~ "ensures that the latest version will " +#~ "be used to install Photini." +#~ msgstr "" + +#~ msgid "" +#~ "After installing Photini the ``photini-" +#~ "configure`` command can be used to " +#~ "choose a Qt package. This allows you" +#~ " to try each until you find one" +#~ " that works satisfactorily on your " +#~ "computer." +#~ msgstr "" + +#~ msgid "Firstly install Photini with pip_:" +#~ msgstr "" + +#~ msgid "" +#~ "Photini's optional dependencies can be " +#~ "included in the installation by listing " +#~ "them as \"extras\" in the pip " +#~ "command. For example, if you want to" +#~ " be able to upload to Flickr and" +#~ " Ipernity:" +#~ msgstr "" + +#~ msgid "Note that the extras' names are not case-sensitive." +#~ msgstr "" + +#~ msgid "" +#~ "You can install all of Photini's " +#~ "optional dependencies by adding an ``all``" +#~ " extra. You can also install any " +#~ "of the Qt packages as extras:" +#~ msgstr "" + +#~ msgid "" +#~ "Now run the ``photini-configure`` command" +#~ " to choose which Qt package to " +#~ "use. (The Windows example is running " +#~ "Windows |nbsp| 7, so PyQt6 and " +#~ "PySide6 are not available):" +#~ msgstr "" + +#~ msgid "" +#~ "The command asks a series of " +#~ "questions, then runs pip_ to install " +#~ "any extra dependencies that are needed, " +#~ "then updates your Photini configuration " +#~ "file." +#~ msgstr "" + +#~ msgid "" +#~ "Most of the dependencies required for " +#~ "Photini's optional features can also be " +#~ "installed with ``photini-configure``. Default " +#~ "answers are given in square brackets:" +#~ msgstr "" + +#~ msgid "" +#~ "One optional dependency that cannot be " +#~ "installed with pip_ or ``photini-" +#~ "configure`` is FFmpeg_. This is used " +#~ "to read metadata from video files. " +#~ "Linux & MacOS users can install it" +#~ " with the system package manager, but" +#~ " installing it on Windows is non-" +#~ "trivial." +#~ msgstr "" + +#~ msgid "" +#~ "The ``photini-post-install`` command has" +#~ " a ``--language`` option that can set" +#~ " the language used for the description" +#~ " that accompaines a desktop icon (if " +#~ "Photini has been translated into that " +#~ "language)." +#~ msgstr "" + +#~ msgid "" +#~ "To install Photini menu shortcuts for " +#~ "all users you can run the post " +#~ "install command as root (Linux) or in" +#~ " a command window run as administrator" +#~ " (Windows). It is important to use " +#~ "the full path to the post install " +#~ "command:" +#~ msgstr "" + +#~ msgid "" +#~ "[1] PyQt_, PySide2_, and PySide6_ are " +#~ "Python interfaces to the Qt GUI " +#~ "framework. Photini can use any of " +#~ "them (although PyQt is preferred), so " +#~ "you can install whichever one you " +#~ "prefer that is available for your " +#~ "operating system. (Note that PyQt6 and " +#~ "PySide6 are not compatible with Windows " +#~ "versions earlier than Windows 10.) If " +#~ "more than one of them is installed" +#~ " you can choose which one Photini " +#~ "uses by editing its :ref:`configuration " +#~ "file ` or by running" +#~ " ``photini-configure``." +#~ msgstr "" + +#~ msgid "" +#~ "[2] Photini needs the Python interface " +#~ "to QtWebEngine_. This is included in " +#~ "PySide6_ and some PyQt_ or PySide2_ " +#~ "installations, otherwise you need to " +#~ "install a separate package. The " +#~ "``photini-configure`` command will tell you" +#~ " if it's missing." +#~ msgstr "" + +#~ msgid "" +#~ "If you ever have problems running " +#~ "Photini the first thing to do is " +#~ "to run it in a command window. " +#~ "If you installed Photini in a " +#~ "`virtual environment`_ then activate that " +#~ "environment, for example:" +#~ msgstr "" + +#~ msgid "" +#~ "Start the Photini program as follows. " +#~ "If it fails to run you should " +#~ "get some diagnostic information:" +#~ msgstr "" + diff --git a/src/lang/es/LC_MESSAGES/documentation.po b/src/lang/es/LC_MESSAGES/documentation.po index 245f63c3..c5c89d2b 100644 --- a/src/lang/es/LC_MESSAGES/documentation.po +++ b/src/lang/es/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-12 09:35+0100\n" +"POT-Creation-Date: 2024-09-13 10:46+0100\n" "PO-Revision-Date: 2023-04-19 08:54+0000\n" "Last-Translator: Jim Easterbrook , 2023\n" "Language: es@qtfiletype\n" @@ -2465,7 +2465,7 @@ msgid "" msgstr "" msgid "" -"Note that the command is ``python3``. On many machines the ``python`` " +"Note that the command is ``python3``. On some machines the ``python`` " "command still runs Python |nbsp| 2. If you do not have Python |nbsp| 3 " "installed then use your operating system's package manager to install it." msgstr "" @@ -2474,21 +2474,11 @@ msgid "You should also check what version of pip_ is installed::" msgstr "" msgid "" -"Most Linux systems suppress pip's normal version check, but I recommend " -"upgrading pip anyway::" -msgstr "" - -msgid "" -"Note that pip has installed the new version in ``/home/jim/.local`` as " -"normal users can't write to ``/usr``. (Don't be tempted to get round this by" -" using ``sudo`` to run pip. ``/usr/lib/python3/dist-packages`` should only " -"be written by the operating system's package manager.) You may need to log " -"out and then log in again to update your PATH settings. (On some Linux " -"distributions you can simply run ``source ~/.profile`` instead of logging " -"out & in.)" -msgstr "" - -msgid "Running ``pip --version`` again shows the new version::" +"Although pip_ is a Python package manager it should not be used to install " +"packges under ``/usr/lib/``. This system directory should only be used by " +"the operating system's package manager. With recent Python and pip versions " +"you have to use a virtual environment to install other packages such as " +"Photini." msgstr "" msgid "Windows" @@ -2595,7 +2585,8 @@ msgid "" "single user or for multiple users. Multi-user installations use a Python " "`virtual environment`_ to create a self contained installation that can " "easily be shared. Using a virtual environment has other advantages, such as " -"easy uninstallation, so I recommend using it for a single user installation." +"easy uninstallation, so I also recommend using it for a single user " +"installation." msgstr "" msgid "" @@ -2607,7 +2598,8 @@ msgid "" "installing PySide6 / PySide2 / PyQt6 / PyQt5 (whichever is available) with " "the package manager to ensure you install all of its system libraries and " "plugins, and so that you get the same GUI style as other Qt based " -"applications." +"applications. (Don't forget to install the QtWebEngine stuff as well if it's" +" in a seaprate package.)" msgstr "" msgid "Virtual environment" @@ -2621,14 +2613,16 @@ msgstr "" msgid "" "The option ``--system-site-packages`` makes packages installed with the " -"system package manager (e.g. PySide6 / PySide2 / PyQt6 / PyQt5) available " -"within the virtual environment. Note that pip may need to be updated again " -"from within the virtual environment." +"system package manager (e.g. PyQt6) available within the virtual " +"environment." msgstr "" msgid "" "Note that after activating the virtual environment the ``py`` command is not" -" needed. Python, pip, and other Python based commands are run directly. " +" needed. Python, pip, and other Python based commands are run directly." +msgstr "" + +msgid "" "After creating the virtual environment you should update ``pip`` as shown " "above. This ensures that the latest version will be used to install Photini." msgstr "" @@ -2652,40 +2646,76 @@ msgid "" msgstr "" msgid "" -"After installing Photini the ``photini-configure`` command can be used to " -"choose a Qt package. This allows you to try each until you find one that " -"works satisfactorily on your computer." +"I recommend PyQt rather than PySide, and Qt6 rather than Qt5. However, if " +"your operating system already has one of the packages installed then there's" +" probably no reason to use any other." msgstr "" -msgid "Initial installation" +msgid "" +"If you install more than one Qt package you can choose which one Photini " +"uses in its :doc:`configuration <../manual/configuration>`. This allows you " +"to try each until you find one that works satisfactorily on your computer." msgstr "" -msgid "Firstly install Photini with pip_:" +msgid "\"Extras\"" msgstr "" msgid "" -"Photini's optional dependencies can be included in the installation by " -"listing them as \"extras\" in the pip command. For example, if you want to " -"be able to upload to Flickr and Ipernity:" +"Photini has a number of optional extras that can be installed with pip_. " +"These are:" msgstr "" -msgid "Note that the extras' names are not case-sensitive." +msgid "flickr: Enable uploading pictures to Flickr_." msgstr "" -msgid "" -"You can install all of Photini's optional dependencies by adding an ``all`` " -"extra. You can also install any of the Qt packages as extras:" +msgid "google: Enable uploading pictures to `Google Photos`_." msgstr "" -msgid "" -"Now run the ``photini-configure`` command to choose which Qt package to use." -" (The Windows example is running Windows |nbsp| 7, so PyQt6 and PySide6 are " -"not available):" +msgid "ipernity: Enable uploading pictures to Ipernity_." +msgstr "" + +msgid "pixelfed: Enable uploading pictures to Pixelfed_ or Mastodon_." +msgstr "" + +msgid "importer: Import photos directly from a camera (not available on Windows)." +msgstr "" + +msgid "spelling: Install a spell checker for Photini's text entry fields." +msgstr "" + +msgid "gpxpy: Allow importing of GPS data from a phone tracking app or similar." +msgstr "" + +msgid "all: All of the above." +msgstr "" + +msgid "You can also choose to install one or more Qt packages:" +msgstr "" + +msgid "pyqt5" +msgstr "" + +msgid "pyqt6" +msgstr "" + +msgid "pyside2" +msgstr "" + +msgid "pyside6" +msgstr "" + +msgid "The extras are listed in square brackets when running pip_. For example::" +msgstr "" + +msgid "Note that the extras' names are not case sensitive." +msgstr "" + +msgid "Initial installation" msgstr "" msgid "" -"The command asks a series of questions, then runs pip_ to install any extra " -"dependencies that are needed, then updates your Photini configuration file." +"Firstly install Photini and any required extras with pip_. Make sure you " +"include at least one Qt package:" msgstr "" msgid "Test the installation" @@ -2716,9 +2746,8 @@ msgid "Optional dependencies" msgstr "" msgid "" -"Most of the dependencies required for Photini's optional features can also " -"be installed with ``photini-configure``. Default answers are given in square" -" brackets:" +"If you'd like to add any of the \"extras\" listed earlier to your Photini " +"installation, you just need to run pip_ again:" msgstr "" msgid "" @@ -2727,10 +2756,10 @@ msgid "" msgstr "" msgid "" -"One optional dependency that cannot be installed with pip_ or ``photini-" -"configure`` is FFmpeg_. This is used to read metadata from video files. " -"Linux & MacOS users can install it with the system package manager, but " -"installing it on Windows is non-trivial." +"One optional dependency that cannot be installed with pip_ is FFmpeg_. This " +"is used to read metadata from video files. Linux & MacOS users can install " +"it with the system package manager, but installing it on Windows is non-" +"trivial." msgstr "" msgid "Start menu / application menu" @@ -2763,9 +2792,9 @@ msgid "Localisation" msgstr "" msgid "" -"The ``photini-post-install`` command has a ``--language`` option that can " -"set the language used for the description that accompaines a desktop icon " -"(if Photini has been translated into that language)." +"The ``photini-post-install`` command has an option ``--language`` (or " +"``-l``) that can set the language used for the description that accompaines " +"a desktop icon (if Photini has been translated into that language)." msgstr "" msgid "Additional users" @@ -2784,9 +2813,10 @@ msgid "" msgstr "" msgid "" -"To install Photini menu shortcuts for all users you can run the post install" -" command as root (Linux) or in a command window run as administrator " -"(Windows). It is important to use the full path to the post install command:" +"To install Photini menu shortcuts for all users (not recommended) you can " +"run the post install command as root (Linux) or in a command window run as " +"administrator (Windows). It is important to use the full path to the post " +"install command:" msgstr "" msgid "Uninstalling Photini" @@ -2959,15 +2989,14 @@ msgid "" "can install whichever one you prefer that is available for your operating " "system. (Note that PyQt6 and PySide6 are not compatible with Windows " "versions earlier than Windows 10.) If more than one of them is installed you" -" can choose which one Photini uses by editing its :ref:`configuration file " -"` or by running ``photini-configure``." +" can choose which one Photini uses in its :doc:`configuration " +"<../manual/configuration>`" msgstr "" msgid "" "[2] Photini needs the Python interface to QtWebEngine_. This is included in " "PySide6_ and some PyQt_ or PySide2_ installations, otherwise you need to " -"install a separate package. The ``photini-configure`` command will tell you " -"if it's missing." +"install a separate package." msgstr "" msgid "" @@ -3094,12 +3123,8 @@ msgstr "" msgid "" "If you ever have problems running Photini the first thing to do is to run it" " in a command window. If you installed Photini in a `virtual environment`_ " -"then activate that environment, for example:" -msgstr "" - -msgid "" -"Start the Photini program as follows. If it fails to run you should get some" -" diagnostic information:" +"then activate that environment first. Run the Photini program as a Python " +"module. If it fails to run you should get some diagnostic information:" msgstr "" msgid "" @@ -4601,3 +4626,218 @@ msgstr "" #~ " wheel." #~ msgstr "" +#~ msgid "" +#~ "Note that the command is ``python3``. " +#~ "On many machines the ``python`` command " +#~ "still runs Python |nbsp| 2. If you" +#~ " do not have Python |nbsp| 3 " +#~ "installed then use your operating system's" +#~ " package manager to install it." +#~ msgstr "" + +#~ msgid "" +#~ "Most Linux systems suppress pip's normal" +#~ " version check, but I recommend " +#~ "upgrading pip anyway::" +#~ msgstr "" + +#~ msgid "" +#~ "Note that pip has installed the new" +#~ " version in ``/home/jim/.local`` as normal " +#~ "users can't write to ``/usr``. (Don't " +#~ "be tempted to get round this by " +#~ "using ``sudo`` to run pip. " +#~ "``/usr/lib/python3/dist-packages`` should only be" +#~ " written by the operating system's " +#~ "package manager.) You may need to log" +#~ " out and then log in again to " +#~ "update your PATH settings. (On some " +#~ "Linux distributions you can simply run " +#~ "``source ~/.profile`` instead of logging " +#~ "out & in.)" +#~ msgstr "" + +#~ msgid "Running ``pip --version`` again shows the new version::" +#~ msgstr "" + +#~ msgid "" +#~ "Before installing Photini you need to " +#~ "decide if you are installing it for" +#~ " a single user or for multiple " +#~ "users. Multi-user installations use a " +#~ "Python `virtual environment`_ to create a" +#~ " self contained installation that can " +#~ "easily be shared. Using a virtual " +#~ "environment has other advantages, such as" +#~ " easy uninstallation, so I recommend " +#~ "using it for a single user " +#~ "installation." +#~ msgstr "" + +#~ msgid "" +#~ "Linux & MacOS users have another " +#~ "decision to make - whether to install" +#~ " Photini's dependencies with pip_ or " +#~ "with the operating system's package " +#~ "manager. For a good introduction to " +#~ "the advantages and disadvantages of each" +#~ " I suggest reading `Managing Python " +#~ "packages the right way`_. All of " +#~ "Photini's dependencies can be installed " +#~ "with pip_, but I recommend installing " +#~ "PySide6 / PySide2 / PyQt6 / PyQt5 " +#~ "(whichever is available) with the package" +#~ " manager to ensure you install all " +#~ "of its system libraries and plugins, " +#~ "and so that you get the same " +#~ "GUI style as other Qt based " +#~ "applications." +#~ msgstr "" + +#~ msgid "" +#~ "The option ``--system-site-packages`` makes" +#~ " packages installed with the system " +#~ "package manager (e.g. PySide6 / PySide2 " +#~ "/ PyQt6 / PyQt5) available within the" +#~ " virtual environment. Note that pip may" +#~ " need to be updated again from " +#~ "within the virtual environment." +#~ msgstr "" + +#~ msgid "" +#~ "Note that after activating the virtual " +#~ "environment the ``py`` command is not " +#~ "needed. Python, pip, and other Python " +#~ "based commands are run directly. After " +#~ "creating the virtual environment you should" +#~ " update ``pip`` as shown above. This " +#~ "ensures that the latest version will " +#~ "be used to install Photini." +#~ msgstr "" + +#~ msgid "" +#~ "After installing Photini the ``photini-" +#~ "configure`` command can be used to " +#~ "choose a Qt package. This allows you" +#~ " to try each until you find one" +#~ " that works satisfactorily on your " +#~ "computer." +#~ msgstr "" + +#~ msgid "Firstly install Photini with pip_:" +#~ msgstr "" + +#~ msgid "" +#~ "Photini's optional dependencies can be " +#~ "included in the installation by listing " +#~ "them as \"extras\" in the pip " +#~ "command. For example, if you want to" +#~ " be able to upload to Flickr and" +#~ " Ipernity:" +#~ msgstr "" + +#~ msgid "Note that the extras' names are not case-sensitive." +#~ msgstr "" + +#~ msgid "" +#~ "You can install all of Photini's " +#~ "optional dependencies by adding an ``all``" +#~ " extra. You can also install any " +#~ "of the Qt packages as extras:" +#~ msgstr "" + +#~ msgid "" +#~ "Now run the ``photini-configure`` command" +#~ " to choose which Qt package to " +#~ "use. (The Windows example is running " +#~ "Windows |nbsp| 7, so PyQt6 and " +#~ "PySide6 are not available):" +#~ msgstr "" + +#~ msgid "" +#~ "The command asks a series of " +#~ "questions, then runs pip_ to install " +#~ "any extra dependencies that are needed, " +#~ "then updates your Photini configuration " +#~ "file." +#~ msgstr "" + +#~ msgid "" +#~ "Most of the dependencies required for " +#~ "Photini's optional features can also be " +#~ "installed with ``photini-configure``. Default " +#~ "answers are given in square brackets:" +#~ msgstr "" + +#~ msgid "" +#~ "One optional dependency that cannot be " +#~ "installed with pip_ or ``photini-" +#~ "configure`` is FFmpeg_. This is used " +#~ "to read metadata from video files. " +#~ "Linux & MacOS users can install it" +#~ " with the system package manager, but" +#~ " installing it on Windows is non-" +#~ "trivial." +#~ msgstr "" + +#~ msgid "" +#~ "The ``photini-post-install`` command has" +#~ " a ``--language`` option that can set" +#~ " the language used for the description" +#~ " that accompaines a desktop icon (if " +#~ "Photini has been translated into that " +#~ "language)." +#~ msgstr "" + +#~ msgid "" +#~ "To install Photini menu shortcuts for " +#~ "all users you can run the post " +#~ "install command as root (Linux) or in" +#~ " a command window run as administrator" +#~ " (Windows). It is important to use " +#~ "the full path to the post install " +#~ "command:" +#~ msgstr "" + +#~ msgid "" +#~ "[1] PyQt_, PySide2_, and PySide6_ are " +#~ "Python interfaces to the Qt GUI " +#~ "framework. Photini can use any of " +#~ "them (although PyQt is preferred), so " +#~ "you can install whichever one you " +#~ "prefer that is available for your " +#~ "operating system. (Note that PyQt6 and " +#~ "PySide6 are not compatible with Windows " +#~ "versions earlier than Windows 10.) If " +#~ "more than one of them is installed" +#~ " you can choose which one Photini " +#~ "uses by editing its :ref:`configuration " +#~ "file ` or by running" +#~ " ``photini-configure``." +#~ msgstr "" + +#~ msgid "" +#~ "[2] Photini needs the Python interface " +#~ "to QtWebEngine_. This is included in " +#~ "PySide6_ and some PyQt_ or PySide2_ " +#~ "installations, otherwise you need to " +#~ "install a separate package. The " +#~ "``photini-configure`` command will tell you" +#~ " if it's missing." +#~ msgstr "" + +#~ msgid "" +#~ "If you ever have problems running " +#~ "Photini the first thing to do is " +#~ "to run it in a command window. " +#~ "If you installed Photini in a " +#~ "`virtual environment`_ then activate that " +#~ "environment, for example:" +#~ msgstr "" + +#~ msgid "" +#~ "Start the Photini program as follows. " +#~ "If it fails to run you should " +#~ "get some diagnostic information:" +#~ msgstr "" + diff --git a/src/lang/fr/LC_MESSAGES/documentation.po b/src/lang/fr/LC_MESSAGES/documentation.po index 5e82e98b..205dd00c 100644 --- a/src/lang/fr/LC_MESSAGES/documentation.po +++ b/src/lang/fr/LC_MESSAGES/documentation.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Photini 2023.4.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-09-12 09:35+0100\n" +"POT-Creation-Date: 2024-09-13 10:46+0100\n" "PO-Revision-Date: 2023-04-19 08:54+0000\n" "Last-Translator: Jim Easterbrook , 2023\n" "Language: fr@qtfiletype\n" @@ -2460,7 +2460,7 @@ msgid "" msgstr "" msgid "" -"Note that the command is ``python3``. On many machines the ``python`` " +"Note that the command is ``python3``. On some machines the ``python`` " "command still runs Python |nbsp| 2. If you do not have Python |nbsp| 3 " "installed then use your operating system's package manager to install it." msgstr "" @@ -2469,21 +2469,11 @@ msgid "You should also check what version of pip_ is installed::" msgstr "" msgid "" -"Most Linux systems suppress pip's normal version check, but I recommend " -"upgrading pip anyway::" -msgstr "" - -msgid "" -"Note that pip has installed the new version in ``/home/jim/.local`` as " -"normal users can't write to ``/usr``. (Don't be tempted to get round this by" -" using ``sudo`` to run pip. ``/usr/lib/python3/dist-packages`` should only " -"be written by the operating system's package manager.) You may need to log " -"out and then log in again to update your PATH settings. (On some Linux " -"distributions you can simply run ``source ~/.profile`` instead of logging " -"out & in.)" -msgstr "" - -msgid "Running ``pip --version`` again shows the new version::" +"Although pip_ is a Python package manager it should not be used to install " +"packges under ``/usr/lib/``. This system directory should only be used by " +"the operating system's package manager. With recent Python and pip versions " +"you have to use a virtual environment to install other packages such as " +"Photini." msgstr "" msgid "Windows" @@ -2590,7 +2580,8 @@ msgid "" "single user or for multiple users. Multi-user installations use a Python " "`virtual environment`_ to create a self contained installation that can " "easily be shared. Using a virtual environment has other advantages, such as " -"easy uninstallation, so I recommend using it for a single user installation." +"easy uninstallation, so I also recommend using it for a single user " +"installation." msgstr "" msgid "" @@ -2602,7 +2593,8 @@ msgid "" "installing PySide6 / PySide2 / PyQt6 / PyQt5 (whichever is available) with " "the package manager to ensure you install all of its system libraries and " "plugins, and so that you get the same GUI style as other Qt based " -"applications." +"applications. (Don't forget to install the QtWebEngine stuff as well if it's" +" in a seaprate package.)" msgstr "" msgid "Virtual environment" @@ -2616,14 +2608,16 @@ msgstr "" msgid "" "The option ``--system-site-packages`` makes packages installed with the " -"system package manager (e.g. PySide6 / PySide2 / PyQt6 / PyQt5) available " -"within the virtual environment. Note that pip may need to be updated again " -"from within the virtual environment." +"system package manager (e.g. PyQt6) available within the virtual " +"environment." msgstr "" msgid "" "Note that after activating the virtual environment the ``py`` command is not" -" needed. Python, pip, and other Python based commands are run directly. " +" needed. Python, pip, and other Python based commands are run directly." +msgstr "" + +msgid "" "After creating the virtual environment you should update ``pip`` as shown " "above. This ensures that the latest version will be used to install Photini." msgstr "" @@ -2647,40 +2641,76 @@ msgid "" msgstr "" msgid "" -"After installing Photini the ``photini-configure`` command can be used to " -"choose a Qt package. This allows you to try each until you find one that " -"works satisfactorily on your computer." +"I recommend PyQt rather than PySide, and Qt6 rather than Qt5. However, if " +"your operating system already has one of the packages installed then there's" +" probably no reason to use any other." msgstr "" -msgid "Initial installation" +msgid "" +"If you install more than one Qt package you can choose which one Photini " +"uses in its :doc:`configuration <../manual/configuration>`. This allows you " +"to try each until you find one that works satisfactorily on your computer." msgstr "" -msgid "Firstly install Photini with pip_:" +msgid "\"Extras\"" msgstr "" msgid "" -"Photini's optional dependencies can be included in the installation by " -"listing them as \"extras\" in the pip command. For example, if you want to " -"be able to upload to Flickr and Ipernity:" +"Photini has a number of optional extras that can be installed with pip_. " +"These are:" msgstr "" -msgid "Note that the extras' names are not case-sensitive." +msgid "flickr: Enable uploading pictures to Flickr_." msgstr "" -msgid "" -"You can install all of Photini's optional dependencies by adding an ``all`` " -"extra. You can also install any of the Qt packages as extras:" +msgid "google: Enable uploading pictures to `Google Photos`_." msgstr "" -msgid "" -"Now run the ``photini-configure`` command to choose which Qt package to use." -" (The Windows example is running Windows |nbsp| 7, so PyQt6 and PySide6 are " -"not available):" +msgid "ipernity: Enable uploading pictures to Ipernity_." +msgstr "" + +msgid "pixelfed: Enable uploading pictures to Pixelfed_ or Mastodon_." +msgstr "" + +msgid "importer: Import photos directly from a camera (not available on Windows)." +msgstr "" + +msgid "spelling: Install a spell checker for Photini's text entry fields." +msgstr "" + +msgid "gpxpy: Allow importing of GPS data from a phone tracking app or similar." +msgstr "" + +msgid "all: All of the above." +msgstr "" + +msgid "You can also choose to install one or more Qt packages:" +msgstr "" + +msgid "pyqt5" +msgstr "" + +msgid "pyqt6" +msgstr "" + +msgid "pyside2" +msgstr "" + +msgid "pyside6" +msgstr "" + +msgid "The extras are listed in square brackets when running pip_. For example::" +msgstr "" + +msgid "Note that the extras' names are not case sensitive." +msgstr "" + +msgid "Initial installation" msgstr "" msgid "" -"The command asks a series of questions, then runs pip_ to install any extra " -"dependencies that are needed, then updates your Photini configuration file." +"Firstly install Photini and any required extras with pip_. Make sure you " +"include at least one Qt package:" msgstr "" msgid "Test the installation" @@ -2711,9 +2741,8 @@ msgid "Optional dependencies" msgstr "" msgid "" -"Most of the dependencies required for Photini's optional features can also " -"be installed with ``photini-configure``. Default answers are given in square" -" brackets:" +"If you'd like to add any of the \"extras\" listed earlier to your Photini " +"installation, you just need to run pip_ again:" msgstr "" msgid "" @@ -2722,10 +2751,10 @@ msgid "" msgstr "" msgid "" -"One optional dependency that cannot be installed with pip_ or ``photini-" -"configure`` is FFmpeg_. This is used to read metadata from video files. " -"Linux & MacOS users can install it with the system package manager, but " -"installing it on Windows is non-trivial." +"One optional dependency that cannot be installed with pip_ is FFmpeg_. This " +"is used to read metadata from video files. Linux & MacOS users can install " +"it with the system package manager, but installing it on Windows is non-" +"trivial." msgstr "" msgid "Start menu / application menu" @@ -2758,9 +2787,9 @@ msgid "Localisation" msgstr "" msgid "" -"The ``photini-post-install`` command has a ``--language`` option that can " -"set the language used for the description that accompaines a desktop icon " -"(if Photini has been translated into that language)." +"The ``photini-post-install`` command has an option ``--language`` (or " +"``-l``) that can set the language used for the description that accompaines " +"a desktop icon (if Photini has been translated into that language)." msgstr "" msgid "Additional users" @@ -2779,9 +2808,10 @@ msgid "" msgstr "" msgid "" -"To install Photini menu shortcuts for all users you can run the post install" -" command as root (Linux) or in a command window run as administrator " -"(Windows). It is important to use the full path to the post install command:" +"To install Photini menu shortcuts for all users (not recommended) you can " +"run the post install command as root (Linux) or in a command window run as " +"administrator (Windows). It is important to use the full path to the post " +"install command:" msgstr "" msgid "Uninstalling Photini" @@ -2954,15 +2984,14 @@ msgid "" "can install whichever one you prefer that is available for your operating " "system. (Note that PyQt6 and PySide6 are not compatible with Windows " "versions earlier than Windows 10.) If more than one of them is installed you" -" can choose which one Photini uses by editing its :ref:`configuration file " -"` or by running ``photini-configure``." +" can choose which one Photini uses in its :doc:`configuration " +"<../manual/configuration>`" msgstr "" msgid "" "[2] Photini needs the Python interface to QtWebEngine_. This is included in " "PySide6_ and some PyQt_ or PySide2_ installations, otherwise you need to " -"install a separate package. The ``photini-configure`` command will tell you " -"if it's missing." +"install a separate package." msgstr "" msgid "" @@ -3089,12 +3118,8 @@ msgstr "" msgid "" "If you ever have problems running Photini the first thing to do is to run it" " in a command window. If you installed Photini in a `virtual environment`_ " -"then activate that environment, for example:" -msgstr "" - -msgid "" -"Start the Photini program as follows. If it fails to run you should get some" -" diagnostic information:" +"then activate that environment first. Run the Photini program as a Python " +"module. If it fails to run you should get some diagnostic information:" msgstr "" msgid "" @@ -4596,3 +4621,218 @@ msgstr "" #~ " wheel." #~ msgstr "" +#~ msgid "" +#~ "Note that the command is ``python3``. " +#~ "On many machines the ``python`` command " +#~ "still runs Python |nbsp| 2. If you" +#~ " do not have Python |nbsp| 3 " +#~ "installed then use your operating system's" +#~ " package manager to install it." +#~ msgstr "" + +#~ msgid "" +#~ "Most Linux systems suppress pip's normal" +#~ " version check, but I recommend " +#~ "upgrading pip anyway::" +#~ msgstr "" + +#~ msgid "" +#~ "Note that pip has installed the new" +#~ " version in ``/home/jim/.local`` as normal " +#~ "users can't write to ``/usr``. (Don't " +#~ "be tempted to get round this by " +#~ "using ``sudo`` to run pip. " +#~ "``/usr/lib/python3/dist-packages`` should only be" +#~ " written by the operating system's " +#~ "package manager.) You may need to log" +#~ " out and then log in again to " +#~ "update your PATH settings. (On some " +#~ "Linux distributions you can simply run " +#~ "``source ~/.profile`` instead of logging " +#~ "out & in.)" +#~ msgstr "" + +#~ msgid "Running ``pip --version`` again shows the new version::" +#~ msgstr "" + +#~ msgid "" +#~ "Before installing Photini you need to " +#~ "decide if you are installing it for" +#~ " a single user or for multiple " +#~ "users. Multi-user installations use a " +#~ "Python `virtual environment`_ to create a" +#~ " self contained installation that can " +#~ "easily be shared. Using a virtual " +#~ "environment has other advantages, such as" +#~ " easy uninstallation, so I recommend " +#~ "using it for a single user " +#~ "installation." +#~ msgstr "" + +#~ msgid "" +#~ "Linux & MacOS users have another " +#~ "decision to make - whether to install" +#~ " Photini's dependencies with pip_ or " +#~ "with the operating system's package " +#~ "manager. For a good introduction to " +#~ "the advantages and disadvantages of each" +#~ " I suggest reading `Managing Python " +#~ "packages the right way`_. All of " +#~ "Photini's dependencies can be installed " +#~ "with pip_, but I recommend installing " +#~ "PySide6 / PySide2 / PyQt6 / PyQt5 " +#~ "(whichever is available) with the package" +#~ " manager to ensure you install all " +#~ "of its system libraries and plugins, " +#~ "and so that you get the same " +#~ "GUI style as other Qt based " +#~ "applications." +#~ msgstr "" + +#~ msgid "" +#~ "The option ``--system-site-packages`` makes" +#~ " packages installed with the system " +#~ "package manager (e.g. PySide6 / PySide2 " +#~ "/ PyQt6 / PyQt5) available within the" +#~ " virtual environment. Note that pip may" +#~ " need to be updated again from " +#~ "within the virtual environment." +#~ msgstr "" + +#~ msgid "" +#~ "Note that after activating the virtual " +#~ "environment the ``py`` command is not " +#~ "needed. Python, pip, and other Python " +#~ "based commands are run directly. After " +#~ "creating the virtual environment you should" +#~ " update ``pip`` as shown above. This " +#~ "ensures that the latest version will " +#~ "be used to install Photini." +#~ msgstr "" + +#~ msgid "" +#~ "After installing Photini the ``photini-" +#~ "configure`` command can be used to " +#~ "choose a Qt package. This allows you" +#~ " to try each until you find one" +#~ " that works satisfactorily on your " +#~ "computer." +#~ msgstr "" + +#~ msgid "Firstly install Photini with pip_:" +#~ msgstr "" + +#~ msgid "" +#~ "Photini's optional dependencies can be " +#~ "included in the installation by listing " +#~ "them as \"extras\" in the pip " +#~ "command. For example, if you want to" +#~ " be able to upload to Flickr and" +#~ " Ipernity:" +#~ msgstr "" + +#~ msgid "Note that the extras' names are not case-sensitive." +#~ msgstr "" + +#~ msgid "" +#~ "You can install all of Photini's " +#~ "optional dependencies by adding an ``all``" +#~ " extra. You can also install any " +#~ "of the Qt packages as extras:" +#~ msgstr "" + +#~ msgid "" +#~ "Now run the ``photini-configure`` command" +#~ " to choose which Qt package to " +#~ "use. (The Windows example is running " +#~ "Windows |nbsp| 7, so PyQt6 and " +#~ "PySide6 are not available):" +#~ msgstr "" + +#~ msgid "" +#~ "The command asks a series of " +#~ "questions, then runs pip_ to install " +#~ "any extra dependencies that are needed, " +#~ "then updates your Photini configuration " +#~ "file." +#~ msgstr "" + +#~ msgid "" +#~ "Most of the dependencies required for " +#~ "Photini's optional features can also be " +#~ "installed with ``photini-configure``. Default " +#~ "answers are given in square brackets:" +#~ msgstr "" + +#~ msgid "" +#~ "One optional dependency that cannot be " +#~ "installed with pip_ or ``photini-" +#~ "configure`` is FFmpeg_. This is used " +#~ "to read metadata from video files. " +#~ "Linux & MacOS users can install it" +#~ " with the system package manager, but" +#~ " installing it on Windows is non-" +#~ "trivial." +#~ msgstr "" + +#~ msgid "" +#~ "The ``photini-post-install`` command has" +#~ " a ``--language`` option that can set" +#~ " the language used for the description" +#~ " that accompaines a desktop icon (if " +#~ "Photini has been translated into that " +#~ "language)." +#~ msgstr "" + +#~ msgid "" +#~ "To install Photini menu shortcuts for " +#~ "all users you can run the post " +#~ "install command as root (Linux) or in" +#~ " a command window run as administrator" +#~ " (Windows). It is important to use " +#~ "the full path to the post install " +#~ "command:" +#~ msgstr "" + +#~ msgid "" +#~ "[1] PyQt_, PySide2_, and PySide6_ are " +#~ "Python interfaces to the Qt GUI " +#~ "framework. Photini can use any of " +#~ "them (although PyQt is preferred), so " +#~ "you can install whichever one you " +#~ "prefer that is available for your " +#~ "operating system. (Note that PyQt6 and " +#~ "PySide6 are not compatible with Windows " +#~ "versions earlier than Windows 10.) If " +#~ "more than one of them is installed" +#~ " you can choose which one Photini " +#~ "uses by editing its :ref:`configuration " +#~ "file ` or by running" +#~ " ``photini-configure``." +#~ msgstr "" + +#~ msgid "" +#~ "[2] Photini needs the Python interface " +#~ "to QtWebEngine_. This is included in " +#~ "PySide6_ and some PyQt_ or PySide2_ " +#~ "installations, otherwise you need to " +#~ "install a separate package. The " +#~ "``photini-configure`` command will tell you" +#~ " if it's missing." +#~ msgstr "" + +#~ msgid "" +#~ "If you ever have problems running " +#~ "Photini the first thing to do is " +#~ "to run it in a command window. " +#~ "If you installed Photini in a " +#~ "`virtual environment`_ then activate that " +#~ "environment, for example:" +#~ msgstr "" + +#~ msgid "" +#~ "Start the Photini program as follows. " +#~ "If it fails to run you should " +#~ "get some diagnostic information:" +#~ msgstr "" + diff --git a/src/lang/it/LC_MESSAGES/documentation.po b/src/lang/it/LC_MESSAGES/documentation.po index 5d553083..94471377 100644 --- a/src/lang/it/LC_MESSAGES/documentation.po +++ b/src/lang/it/LC_MESSAGES/documentation.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Photini 2023.4.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-09-12 09:35+0100\n" +"POT-Creation-Date: 2024-09-13 10:46+0100\n" "PO-Revision-Date: 2023-04-19 08:54+0000\n" "Last-Translator: alessio Cadore , 2023\n" "Language: it@qtfiletype\n" @@ -2460,7 +2460,7 @@ msgid "" msgstr "" msgid "" -"Note that the command is ``python3``. On many machines the ``python`` " +"Note that the command is ``python3``. On some machines the ``python`` " "command still runs Python |nbsp| 2. If you do not have Python |nbsp| 3 " "installed then use your operating system's package manager to install it." msgstr "" @@ -2469,21 +2469,11 @@ msgid "You should also check what version of pip_ is installed::" msgstr "" msgid "" -"Most Linux systems suppress pip's normal version check, but I recommend " -"upgrading pip anyway::" -msgstr "" - -msgid "" -"Note that pip has installed the new version in ``/home/jim/.local`` as " -"normal users can't write to ``/usr``. (Don't be tempted to get round this by" -" using ``sudo`` to run pip. ``/usr/lib/python3/dist-packages`` should only " -"be written by the operating system's package manager.) You may need to log " -"out and then log in again to update your PATH settings. (On some Linux " -"distributions you can simply run ``source ~/.profile`` instead of logging " -"out & in.)" -msgstr "" - -msgid "Running ``pip --version`` again shows the new version::" +"Although pip_ is a Python package manager it should not be used to install " +"packges under ``/usr/lib/``. This system directory should only be used by " +"the operating system's package manager. With recent Python and pip versions " +"you have to use a virtual environment to install other packages such as " +"Photini." msgstr "" msgid "Windows" @@ -2590,7 +2580,8 @@ msgid "" "single user or for multiple users. Multi-user installations use a Python " "`virtual environment`_ to create a self contained installation that can " "easily be shared. Using a virtual environment has other advantages, such as " -"easy uninstallation, so I recommend using it for a single user installation." +"easy uninstallation, so I also recommend using it for a single user " +"installation." msgstr "" msgid "" @@ -2602,7 +2593,8 @@ msgid "" "installing PySide6 / PySide2 / PyQt6 / PyQt5 (whichever is available) with " "the package manager to ensure you install all of its system libraries and " "plugins, and so that you get the same GUI style as other Qt based " -"applications." +"applications. (Don't forget to install the QtWebEngine stuff as well if it's" +" in a seaprate package.)" msgstr "" msgid "Virtual environment" @@ -2616,14 +2608,16 @@ msgstr "" msgid "" "The option ``--system-site-packages`` makes packages installed with the " -"system package manager (e.g. PySide6 / PySide2 / PyQt6 / PyQt5) available " -"within the virtual environment. Note that pip may need to be updated again " -"from within the virtual environment." +"system package manager (e.g. PyQt6) available within the virtual " +"environment." msgstr "" msgid "" "Note that after activating the virtual environment the ``py`` command is not" -" needed. Python, pip, and other Python based commands are run directly. " +" needed. Python, pip, and other Python based commands are run directly." +msgstr "" + +msgid "" "After creating the virtual environment you should update ``pip`` as shown " "above. This ensures that the latest version will be used to install Photini." msgstr "" @@ -2647,40 +2641,76 @@ msgid "" msgstr "" msgid "" -"After installing Photini the ``photini-configure`` command can be used to " -"choose a Qt package. This allows you to try each until you find one that " -"works satisfactorily on your computer." +"I recommend PyQt rather than PySide, and Qt6 rather than Qt5. However, if " +"your operating system already has one of the packages installed then there's" +" probably no reason to use any other." msgstr "" -msgid "Initial installation" +msgid "" +"If you install more than one Qt package you can choose which one Photini " +"uses in its :doc:`configuration <../manual/configuration>`. This allows you " +"to try each until you find one that works satisfactorily on your computer." msgstr "" -msgid "Firstly install Photini with pip_:" +msgid "\"Extras\"" msgstr "" msgid "" -"Photini's optional dependencies can be included in the installation by " -"listing them as \"extras\" in the pip command. For example, if you want to " -"be able to upload to Flickr and Ipernity:" +"Photini has a number of optional extras that can be installed with pip_. " +"These are:" msgstr "" -msgid "Note that the extras' names are not case-sensitive." +msgid "flickr: Enable uploading pictures to Flickr_." msgstr "" -msgid "" -"You can install all of Photini's optional dependencies by adding an ``all`` " -"extra. You can also install any of the Qt packages as extras:" +msgid "google: Enable uploading pictures to `Google Photos`_." msgstr "" -msgid "" -"Now run the ``photini-configure`` command to choose which Qt package to use." -" (The Windows example is running Windows |nbsp| 7, so PyQt6 and PySide6 are " -"not available):" +msgid "ipernity: Enable uploading pictures to Ipernity_." +msgstr "" + +msgid "pixelfed: Enable uploading pictures to Pixelfed_ or Mastodon_." +msgstr "" + +msgid "importer: Import photos directly from a camera (not available on Windows)." +msgstr "" + +msgid "spelling: Install a spell checker for Photini's text entry fields." +msgstr "" + +msgid "gpxpy: Allow importing of GPS data from a phone tracking app or similar." +msgstr "" + +msgid "all: All of the above." +msgstr "" + +msgid "You can also choose to install one or more Qt packages:" +msgstr "" + +msgid "pyqt5" +msgstr "" + +msgid "pyqt6" +msgstr "" + +msgid "pyside2" +msgstr "" + +msgid "pyside6" +msgstr "" + +msgid "The extras are listed in square brackets when running pip_. For example::" +msgstr "" + +msgid "Note that the extras' names are not case sensitive." +msgstr "" + +msgid "Initial installation" msgstr "" msgid "" -"The command asks a series of questions, then runs pip_ to install any extra " -"dependencies that are needed, then updates your Photini configuration file." +"Firstly install Photini and any required extras with pip_. Make sure you " +"include at least one Qt package:" msgstr "" msgid "Test the installation" @@ -2711,9 +2741,8 @@ msgid "Optional dependencies" msgstr "" msgid "" -"Most of the dependencies required for Photini's optional features can also " -"be installed with ``photini-configure``. Default answers are given in square" -" brackets:" +"If you'd like to add any of the \"extras\" listed earlier to your Photini " +"installation, you just need to run pip_ again:" msgstr "" msgid "" @@ -2722,10 +2751,10 @@ msgid "" msgstr "" msgid "" -"One optional dependency that cannot be installed with pip_ or ``photini-" -"configure`` is FFmpeg_. This is used to read metadata from video files. " -"Linux & MacOS users can install it with the system package manager, but " -"installing it on Windows is non-trivial." +"One optional dependency that cannot be installed with pip_ is FFmpeg_. This " +"is used to read metadata from video files. Linux & MacOS users can install " +"it with the system package manager, but installing it on Windows is non-" +"trivial." msgstr "" msgid "Start menu / application menu" @@ -2758,9 +2787,9 @@ msgid "Localisation" msgstr "" msgid "" -"The ``photini-post-install`` command has a ``--language`` option that can " -"set the language used for the description that accompaines a desktop icon " -"(if Photini has been translated into that language)." +"The ``photini-post-install`` command has an option ``--language`` (or " +"``-l``) that can set the language used for the description that accompaines " +"a desktop icon (if Photini has been translated into that language)." msgstr "" msgid "Additional users" @@ -2779,9 +2808,10 @@ msgid "" msgstr "" msgid "" -"To install Photini menu shortcuts for all users you can run the post install" -" command as root (Linux) or in a command window run as administrator " -"(Windows). It is important to use the full path to the post install command:" +"To install Photini menu shortcuts for all users (not recommended) you can " +"run the post install command as root (Linux) or in a command window run as " +"administrator (Windows). It is important to use the full path to the post " +"install command:" msgstr "" msgid "Uninstalling Photini" @@ -2954,15 +2984,14 @@ msgid "" "can install whichever one you prefer that is available for your operating " "system. (Note that PyQt6 and PySide6 are not compatible with Windows " "versions earlier than Windows 10.) If more than one of them is installed you" -" can choose which one Photini uses by editing its :ref:`configuration file " -"` or by running ``photini-configure``." +" can choose which one Photini uses in its :doc:`configuration " +"<../manual/configuration>`" msgstr "" msgid "" "[2] Photini needs the Python interface to QtWebEngine_. This is included in " "PySide6_ and some PyQt_ or PySide2_ installations, otherwise you need to " -"install a separate package. The ``photini-configure`` command will tell you " -"if it's missing." +"install a separate package." msgstr "" msgid "" @@ -3089,12 +3118,8 @@ msgstr "" msgid "" "If you ever have problems running Photini the first thing to do is to run it" " in a command window. If you installed Photini in a `virtual environment`_ " -"then activate that environment, for example:" -msgstr "" - -msgid "" -"Start the Photini program as follows. If it fails to run you should get some" -" diagnostic information:" +"then activate that environment first. Run the Photini program as a Python " +"module. If it fails to run you should get some diagnostic information:" msgstr "" msgid "" @@ -4596,3 +4621,218 @@ msgstr "" #~ " wheel." #~ msgstr "" +#~ msgid "" +#~ "Note that the command is ``python3``. " +#~ "On many machines the ``python`` command " +#~ "still runs Python |nbsp| 2. If you" +#~ " do not have Python |nbsp| 3 " +#~ "installed then use your operating system's" +#~ " package manager to install it." +#~ msgstr "" + +#~ msgid "" +#~ "Most Linux systems suppress pip's normal" +#~ " version check, but I recommend " +#~ "upgrading pip anyway::" +#~ msgstr "" + +#~ msgid "" +#~ "Note that pip has installed the new" +#~ " version in ``/home/jim/.local`` as normal " +#~ "users can't write to ``/usr``. (Don't " +#~ "be tempted to get round this by " +#~ "using ``sudo`` to run pip. " +#~ "``/usr/lib/python3/dist-packages`` should only be" +#~ " written by the operating system's " +#~ "package manager.) You may need to log" +#~ " out and then log in again to " +#~ "update your PATH settings. (On some " +#~ "Linux distributions you can simply run " +#~ "``source ~/.profile`` instead of logging " +#~ "out & in.)" +#~ msgstr "" + +#~ msgid "Running ``pip --version`` again shows the new version::" +#~ msgstr "" + +#~ msgid "" +#~ "Before installing Photini you need to " +#~ "decide if you are installing it for" +#~ " a single user or for multiple " +#~ "users. Multi-user installations use a " +#~ "Python `virtual environment`_ to create a" +#~ " self contained installation that can " +#~ "easily be shared. Using a virtual " +#~ "environment has other advantages, such as" +#~ " easy uninstallation, so I recommend " +#~ "using it for a single user " +#~ "installation." +#~ msgstr "" + +#~ msgid "" +#~ "Linux & MacOS users have another " +#~ "decision to make - whether to install" +#~ " Photini's dependencies with pip_ or " +#~ "with the operating system's package " +#~ "manager. For a good introduction to " +#~ "the advantages and disadvantages of each" +#~ " I suggest reading `Managing Python " +#~ "packages the right way`_. All of " +#~ "Photini's dependencies can be installed " +#~ "with pip_, but I recommend installing " +#~ "PySide6 / PySide2 / PyQt6 / PyQt5 " +#~ "(whichever is available) with the package" +#~ " manager to ensure you install all " +#~ "of its system libraries and plugins, " +#~ "and so that you get the same " +#~ "GUI style as other Qt based " +#~ "applications." +#~ msgstr "" + +#~ msgid "" +#~ "The option ``--system-site-packages`` makes" +#~ " packages installed with the system " +#~ "package manager (e.g. PySide6 / PySide2 " +#~ "/ PyQt6 / PyQt5) available within the" +#~ " virtual environment. Note that pip may" +#~ " need to be updated again from " +#~ "within the virtual environment." +#~ msgstr "" + +#~ msgid "" +#~ "Note that after activating the virtual " +#~ "environment the ``py`` command is not " +#~ "needed. Python, pip, and other Python " +#~ "based commands are run directly. After " +#~ "creating the virtual environment you should" +#~ " update ``pip`` as shown above. This " +#~ "ensures that the latest version will " +#~ "be used to install Photini." +#~ msgstr "" + +#~ msgid "" +#~ "After installing Photini the ``photini-" +#~ "configure`` command can be used to " +#~ "choose a Qt package. This allows you" +#~ " to try each until you find one" +#~ " that works satisfactorily on your " +#~ "computer." +#~ msgstr "" + +#~ msgid "Firstly install Photini with pip_:" +#~ msgstr "" + +#~ msgid "" +#~ "Photini's optional dependencies can be " +#~ "included in the installation by listing " +#~ "them as \"extras\" in the pip " +#~ "command. For example, if you want to" +#~ " be able to upload to Flickr and" +#~ " Ipernity:" +#~ msgstr "" + +#~ msgid "Note that the extras' names are not case-sensitive." +#~ msgstr "" + +#~ msgid "" +#~ "You can install all of Photini's " +#~ "optional dependencies by adding an ``all``" +#~ " extra. You can also install any " +#~ "of the Qt packages as extras:" +#~ msgstr "" + +#~ msgid "" +#~ "Now run the ``photini-configure`` command" +#~ " to choose which Qt package to " +#~ "use. (The Windows example is running " +#~ "Windows |nbsp| 7, so PyQt6 and " +#~ "PySide6 are not available):" +#~ msgstr "" + +#~ msgid "" +#~ "The command asks a series of " +#~ "questions, then runs pip_ to install " +#~ "any extra dependencies that are needed, " +#~ "then updates your Photini configuration " +#~ "file." +#~ msgstr "" + +#~ msgid "" +#~ "Most of the dependencies required for " +#~ "Photini's optional features can also be " +#~ "installed with ``photini-configure``. Default " +#~ "answers are given in square brackets:" +#~ msgstr "" + +#~ msgid "" +#~ "One optional dependency that cannot be " +#~ "installed with pip_ or ``photini-" +#~ "configure`` is FFmpeg_. This is used " +#~ "to read metadata from video files. " +#~ "Linux & MacOS users can install it" +#~ " with the system package manager, but" +#~ " installing it on Windows is non-" +#~ "trivial." +#~ msgstr "" + +#~ msgid "" +#~ "The ``photini-post-install`` command has" +#~ " a ``--language`` option that can set" +#~ " the language used for the description" +#~ " that accompaines a desktop icon (if " +#~ "Photini has been translated into that " +#~ "language)." +#~ msgstr "" + +#~ msgid "" +#~ "To install Photini menu shortcuts for " +#~ "all users you can run the post " +#~ "install command as root (Linux) or in" +#~ " a command window run as administrator" +#~ " (Windows). It is important to use " +#~ "the full path to the post install " +#~ "command:" +#~ msgstr "" + +#~ msgid "" +#~ "[1] PyQt_, PySide2_, and PySide6_ are " +#~ "Python interfaces to the Qt GUI " +#~ "framework. Photini can use any of " +#~ "them (although PyQt is preferred), so " +#~ "you can install whichever one you " +#~ "prefer that is available for your " +#~ "operating system. (Note that PyQt6 and " +#~ "PySide6 are not compatible with Windows " +#~ "versions earlier than Windows 10.) If " +#~ "more than one of them is installed" +#~ " you can choose which one Photini " +#~ "uses by editing its :ref:`configuration " +#~ "file ` or by running" +#~ " ``photini-configure``." +#~ msgstr "" + +#~ msgid "" +#~ "[2] Photini needs the Python interface " +#~ "to QtWebEngine_. This is included in " +#~ "PySide6_ and some PyQt_ or PySide2_ " +#~ "installations, otherwise you need to " +#~ "install a separate package. The " +#~ "``photini-configure`` command will tell you" +#~ " if it's missing." +#~ msgstr "" + +#~ msgid "" +#~ "If you ever have problems running " +#~ "Photini the first thing to do is " +#~ "to run it in a command window. " +#~ "If you installed Photini in a " +#~ "`virtual environment`_ then activate that " +#~ "environment, for example:" +#~ msgstr "" + +#~ msgid "" +#~ "Start the Photini program as follows. " +#~ "If it fails to run you should " +#~ "get some diagnostic information:" +#~ msgstr "" + diff --git a/src/lang/ko/LC_MESSAGES/documentation.po b/src/lang/ko/LC_MESSAGES/documentation.po index b06725e9..a8c77f59 100644 --- a/src/lang/ko/LC_MESSAGES/documentation.po +++ b/src/lang/ko/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-12 09:35+0100\n" +"POT-Creation-Date: 2024-09-13 10:46+0100\n" "PO-Revision-Date: 2023-04-19 08:54+0000\n" "Last-Translator: Jim Easterbrook , 2023\n" "Language: ko\n" @@ -2923,8 +2923,9 @@ msgstr "" "Python이 이미 설치되어 있어야 하지만 Python |nbsp| 3이 있는지 확인하십시오. 터미널 창을 열고 ``python3`` " "명령을 실행합니다::" +#, fuzzy msgid "" -"Note that the command is ``python3``. On many machines the ``python`` " +"Note that the command is ``python3``. On some machines the ``python`` " "command still runs Python |nbsp| 2. If you do not have Python |nbsp| 3 " "installed then use your operating system's package manager to install it." msgstr "" @@ -2935,23 +2936,13 @@ msgid "You should also check what version of pip_ is installed::" msgstr "설치된 pip_ 버전도 확인해야 합니다::" msgid "" -"Most Linux systems suppress pip's normal version check, but I recommend " -"upgrading pip anyway::" -msgstr "대부분의 리눅스 시스템은 pip의 일반 버전 검사를 금지하지만, 나는 pip를 업그레이드하는 것을 추천합니다:" - -msgid "" -"Note that pip has installed the new version in ``/home/jim/.local`` as " -"normal users can't write to ``/usr``. (Don't be tempted to get round this by" -" using ``sudo`` to run pip. ``/usr/lib/python3/dist-packages`` should only " -"be written by the operating system's package manager.) You may need to log " -"out and then log in again to update your PATH settings. (On some Linux " -"distributions you can simply run ``source ~/.profile`` instead of logging " -"out & in.)" +"Although pip_ is a Python package manager it should not be used to install " +"packges under ``/usr/lib/``. This system directory should only be used by " +"the operating system's package manager. With recent Python and pip versions " +"you have to use a virtual environment to install other packages such as " +"Photini." msgstr "" -msgid "Running ``pip --version`` again shows the new version::" -msgstr "``pip --version`` 을 다시 실행하면 새 버전이 표시됩니다.::" - msgid "Windows" msgstr "Windows" @@ -3063,7 +3054,8 @@ msgid "" "single user or for multiple users. Multi-user installations use a Python " "`virtual environment`_ to create a self contained installation that can " "easily be shared. Using a virtual environment has other advantages, such as " -"easy uninstallation, so I recommend using it for a single user installation." +"easy uninstallation, so I also recommend using it for a single user " +"installation." msgstr "" "Photini를 설치하기 전에 한 명의 사용자를 위해 설치할지 아니면 여러 명의 사용자를 위해 설치할지 결정해야 합니다. 다중 사용자 " "설치는 Python `virtual environment`_ 을 사용하여 쉽게 공유할 수 있는 자체 포함 설치를 만듭니다. 가상 환경을 " @@ -3078,7 +3070,8 @@ msgid "" "installing PySide6 / PySide2 / PyQt6 / PyQt5 (whichever is available) with " "the package manager to ensure you install all of its system libraries and " "plugins, and so that you get the same GUI style as other Qt based " -"applications." +"applications. (Don't forget to install the QtWebEngine stuff as well if it's" +" in a seaprate package.)" msgstr "" msgid "Virtual environment" @@ -3093,14 +3086,16 @@ msgstr "가상 환경을 사용하는 경우 지금 설정해야 합니다. 나 msgid "" "The option ``--system-site-packages`` makes packages installed with the " -"system package manager (e.g. PySide6 / PySide2 / PyQt6 / PyQt5) available " -"within the virtual environment. Note that pip may need to be updated again " -"from within the virtual environment." +"system package manager (e.g. PyQt6) available within the virtual " +"environment." msgstr "" msgid "" "Note that after activating the virtual environment the ``py`` command is not" -" needed. Python, pip, and other Python based commands are run directly. " +" needed. Python, pip, and other Python based commands are run directly." +msgstr "" + +msgid "" "After creating the virtual environment you should update ``pip`` as shown " "above. This ensures that the latest version will be used to install Photini." msgstr "" @@ -3125,40 +3120,78 @@ msgid "" msgstr "" msgid "" -"After installing Photini the ``photini-configure`` command can be used to " -"choose a Qt package. This allows you to try each until you find one that " -"works satisfactorily on your computer." +"I recommend PyQt rather than PySide, and Qt6 rather than Qt5. However, if " +"your operating system already has one of the packages installed then there's" +" probably no reason to use any other." msgstr "" -msgid "Initial installation" +msgid "" +"If you install more than one Qt package you can choose which one Photini " +"uses in its :doc:`configuration <../manual/configuration>`. This allows you " +"to try each until you find one that works satisfactorily on your computer." msgstr "" -msgid "Firstly install Photini with pip_:" +msgid "\"Extras\"" msgstr "" msgid "" -"Photini's optional dependencies can be included in the installation by " -"listing them as \"extras\" in the pip command. For example, if you want to " -"be able to upload to Flickr and Ipernity:" +"Photini has a number of optional extras that can be installed with pip_. " +"These are:" msgstr "" -msgid "Note that the extras' names are not case-sensitive." +msgid "flickr: Enable uploading pictures to Flickr_." msgstr "" -msgid "" -"You can install all of Photini's optional dependencies by adding an ``all`` " -"extra. You can also install any of the Qt packages as extras:" +msgid "google: Enable uploading pictures to `Google Photos`_." msgstr "" -msgid "" -"Now run the ``photini-configure`` command to choose which Qt package to use." -" (The Windows example is running Windows |nbsp| 7, so PyQt6 and PySide6 are " -"not available):" +msgid "ipernity: Enable uploading pictures to Ipernity_." +msgstr "" + +msgid "pixelfed: Enable uploading pictures to Pixelfed_ or Mastodon_." +msgstr "" + +msgid "importer: Import photos directly from a camera (not available on Windows)." +msgstr "" + +msgid "spelling: Install a spell checker for Photini's text entry fields." +msgstr "" + +msgid "gpxpy: Allow importing of GPS data from a phone tracking app or similar." +msgstr "" + +msgid "all: All of the above." +msgstr "" + +msgid "You can also choose to install one or more Qt packages:" +msgstr "" + +msgid "pyqt5" +msgstr "" + +msgid "pyqt6" +msgstr "" + +#, fuzzy +msgid "pyside2" +msgstr "PySide2" + +#, fuzzy +msgid "pyside6" +msgstr "PySide6" + +msgid "The extras are listed in square brackets when running pip_. For example::" +msgstr "" + +msgid "Note that the extras' names are not case sensitive." +msgstr "" + +msgid "Initial installation" msgstr "" msgid "" -"The command asks a series of questions, then runs pip_ to install any extra " -"dependencies that are needed, then updates your Photini configuration file." +"Firstly install Photini and any required extras with pip_. Make sure you " +"include at least one Qt package:" msgstr "" msgid "Test the installation" @@ -3191,9 +3224,8 @@ msgid "Optional dependencies" msgstr "선택적 종속성" msgid "" -"Most of the dependencies required for Photini's optional features can also " -"be installed with ``photini-configure``. Default answers are given in square" -" brackets:" +"If you'd like to add any of the \"extras\" listed earlier to your Photini " +"installation, you just need to run pip_ again:" msgstr "" msgid "" @@ -3204,10 +3236,10 @@ msgstr "" "documentation`_ 를 참조하세요." msgid "" -"One optional dependency that cannot be installed with pip_ or ``photini-" -"configure`` is FFmpeg_. This is used to read metadata from video files. " -"Linux & MacOS users can install it with the system package manager, but " -"installing it on Windows is non-trivial." +"One optional dependency that cannot be installed with pip_ is FFmpeg_. This " +"is used to read metadata from video files. Linux & MacOS users can install " +"it with the system package manager, but installing it on Windows is non-" +"trivial." msgstr "" msgid "Start menu / application menu" @@ -3244,9 +3276,9 @@ msgid "Localisation" msgstr "" msgid "" -"The ``photini-post-install`` command has a ``--language`` option that can " -"set the language used for the description that accompaines a desktop icon " -"(if Photini has been translated into that language)." +"The ``photini-post-install`` command has an option ``--language`` (or " +"``-l``) that can set the language used for the description that accompaines " +"a desktop icon (if Photini has been translated into that language)." msgstr "" msgid "Additional users" @@ -3270,10 +3302,12 @@ msgstr "" "이것은 Photini를 실행하는 매우 편리한 방법이 아니므로 대부분의 사용자는 Photini를 시작/응용 프로그램 메뉴에 추가하기를 원할" " 것입니다." +#, fuzzy msgid "" -"To install Photini menu shortcuts for all users you can run the post install" -" command as root (Linux) or in a command window run as administrator " -"(Windows). It is important to use the full path to the post install command:" +"To install Photini menu shortcuts for all users (not recommended) you can " +"run the post install command as root (Linux) or in a command window run as " +"administrator (Windows). It is important to use the full path to the post " +"install command:" msgstr "" "모든 사용자를 위한 Photini 메뉴 바로 가기를 설치하려면 루트(Linux) 또는 명령 창에서 관리자(Windows)로 실행 후 설치" " 명령을 실행할 수 있습니다. 설치 후 명령에 대한 전체 경로를 사용하는 것이 중요합니다." @@ -3458,15 +3492,14 @@ msgid "" "can install whichever one you prefer that is available for your operating " "system. (Note that PyQt6 and PySide6 are not compatible with Windows " "versions earlier than Windows 10.) If more than one of them is installed you" -" can choose which one Photini uses by editing its :ref:`configuration file " -"` or by running ``photini-configure``." +" can choose which one Photini uses in its :doc:`configuration " +"<../manual/configuration>`" msgstr "" msgid "" "[2] Photini needs the Python interface to QtWebEngine_. This is included in " "PySide6_ and some PyQt_ or PySide2_ installations, otherwise you need to " -"install a separate package. The ``photini-configure`` command will tell you " -"if it's missing." +"install a separate package." msgstr "" msgid "" @@ -3607,19 +3640,16 @@ msgstr "" msgid "Troubleshooting" msgstr "문제 해결" +#, fuzzy msgid "" "If you ever have problems running Photini the first thing to do is to run it" " in a command window. If you installed Photini in a `virtual environment`_ " -"then activate that environment, for example:" +"then activate that environment first. Run the Photini program as a Python " +"module. If it fails to run you should get some diagnostic information:" msgstr "" "Photini를 실행하는 데 문제가 있는 경우 가장 먼저 할 일은 명령 창에서 실행하는 것입니다. `virtual " "environment`_ 에 Photini를 설치한 경우 해당 환경을 활성화합니다. 예를 들면 다음과 같습니다." -msgid "" -"Start the Photini program as follows. If it fails to run you should get some" -" diagnostic information:" -msgstr "다음과 같이 Photini 프로그램을 시작합니다. 실행에 실패하면 몇 가지 진단 정보를 얻어야 합니다." - msgid "" "Note the use of the ``-v`` option to increase the verbosity of Photini's " "message logging. This option can be repeated for even more verbosity." @@ -4973,3 +5003,176 @@ msgstr "" #~ " wheel." #~ msgstr "" +#~ msgid "" +#~ "Most Linux systems suppress pip's normal" +#~ " version check, but I recommend " +#~ "upgrading pip anyway::" +#~ msgstr "대부분의 리눅스 시스템은 pip의 일반 버전 검사를 금지하지만, 나는 pip를 업그레이드하는 것을 추천합니다:" + +#~ msgid "" +#~ "Note that pip has installed the new" +#~ " version in ``/home/jim/.local`` as normal " +#~ "users can't write to ``/usr``. (Don't " +#~ "be tempted to get round this by " +#~ "using ``sudo`` to run pip. " +#~ "``/usr/lib/python3/dist-packages`` should only be" +#~ " written by the operating system's " +#~ "package manager.) You may need to log" +#~ " out and then log in again to " +#~ "update your PATH settings. (On some " +#~ "Linux distributions you can simply run " +#~ "``source ~/.profile`` instead of logging " +#~ "out & in.)" +#~ msgstr "" + +#~ msgid "Running ``pip --version`` again shows the new version::" +#~ msgstr "``pip --version`` 을 다시 실행하면 새 버전이 표시됩니다.::" + +#~ msgid "" +#~ "Linux & MacOS users have another " +#~ "decision to make - whether to install" +#~ " Photini's dependencies with pip_ or " +#~ "with the operating system's package " +#~ "manager. For a good introduction to " +#~ "the advantages and disadvantages of each" +#~ " I suggest reading `Managing Python " +#~ "packages the right way`_. All of " +#~ "Photini's dependencies can be installed " +#~ "with pip_, but I recommend installing " +#~ "PySide6 / PySide2 / PyQt6 / PyQt5 " +#~ "(whichever is available) with the package" +#~ " manager to ensure you install all " +#~ "of its system libraries and plugins, " +#~ "and so that you get the same " +#~ "GUI style as other Qt based " +#~ "applications." +#~ msgstr "" + +#~ msgid "" +#~ "The option ``--system-site-packages`` makes" +#~ " packages installed with the system " +#~ "package manager (e.g. PySide6 / PySide2 " +#~ "/ PyQt6 / PyQt5) available within the" +#~ " virtual environment. Note that pip may" +#~ " need to be updated again from " +#~ "within the virtual environment." +#~ msgstr "" + +#~ msgid "" +#~ "Note that after activating the virtual " +#~ "environment the ``py`` command is not " +#~ "needed. Python, pip, and other Python " +#~ "based commands are run directly. After " +#~ "creating the virtual environment you should" +#~ " update ``pip`` as shown above. This " +#~ "ensures that the latest version will " +#~ "be used to install Photini." +#~ msgstr "" + +#~ msgid "" +#~ "After installing Photini the ``photini-" +#~ "configure`` command can be used to " +#~ "choose a Qt package. This allows you" +#~ " to try each until you find one" +#~ " that works satisfactorily on your " +#~ "computer." +#~ msgstr "" + +#~ msgid "Firstly install Photini with pip_:" +#~ msgstr "" + +#~ msgid "" +#~ "Photini's optional dependencies can be " +#~ "included in the installation by listing " +#~ "them as \"extras\" in the pip " +#~ "command. For example, if you want to" +#~ " be able to upload to Flickr and" +#~ " Ipernity:" +#~ msgstr "" + +#~ msgid "Note that the extras' names are not case-sensitive." +#~ msgstr "" + +#~ msgid "" +#~ "You can install all of Photini's " +#~ "optional dependencies by adding an ``all``" +#~ " extra. You can also install any " +#~ "of the Qt packages as extras:" +#~ msgstr "" + +#~ msgid "" +#~ "Now run the ``photini-configure`` command" +#~ " to choose which Qt package to " +#~ "use. (The Windows example is running " +#~ "Windows |nbsp| 7, so PyQt6 and " +#~ "PySide6 are not available):" +#~ msgstr "" + +#~ msgid "" +#~ "The command asks a series of " +#~ "questions, then runs pip_ to install " +#~ "any extra dependencies that are needed, " +#~ "then updates your Photini configuration " +#~ "file." +#~ msgstr "" + +#~ msgid "" +#~ "Most of the dependencies required for " +#~ "Photini's optional features can also be " +#~ "installed with ``photini-configure``. Default " +#~ "answers are given in square brackets:" +#~ msgstr "" + +#~ msgid "" +#~ "One optional dependency that cannot be " +#~ "installed with pip_ or ``photini-" +#~ "configure`` is FFmpeg_. This is used " +#~ "to read metadata from video files. " +#~ "Linux & MacOS users can install it" +#~ " with the system package manager, but" +#~ " installing it on Windows is non-" +#~ "trivial." +#~ msgstr "" + +#~ msgid "" +#~ "The ``photini-post-install`` command has" +#~ " a ``--language`` option that can set" +#~ " the language used for the description" +#~ " that accompaines a desktop icon (if " +#~ "Photini has been translated into that " +#~ "language)." +#~ msgstr "" + +#~ msgid "" +#~ "[1] PyQt_, PySide2_, and PySide6_ are " +#~ "Python interfaces to the Qt GUI " +#~ "framework. Photini can use any of " +#~ "them (although PyQt is preferred), so " +#~ "you can install whichever one you " +#~ "prefer that is available for your " +#~ "operating system. (Note that PyQt6 and " +#~ "PySide6 are not compatible with Windows " +#~ "versions earlier than Windows 10.) If " +#~ "more than one of them is installed" +#~ " you can choose which one Photini " +#~ "uses by editing its :ref:`configuration " +#~ "file ` or by running" +#~ " ``photini-configure``." +#~ msgstr "" + +#~ msgid "" +#~ "[2] Photini needs the Python interface " +#~ "to QtWebEngine_. This is included in " +#~ "PySide6_ and some PyQt_ or PySide2_ " +#~ "installations, otherwise you need to " +#~ "install a separate package. The " +#~ "``photini-configure`` command will tell you" +#~ " if it's missing." +#~ msgstr "" + +#~ msgid "" +#~ "Start the Photini program as follows. " +#~ "If it fails to run you should " +#~ "get some diagnostic information:" +#~ msgstr "다음과 같이 Photini 프로그램을 시작합니다. 실행에 실패하면 몇 가지 진단 정보를 얻어야 합니다." + diff --git a/src/lang/nb/LC_MESSAGES/documentation.po b/src/lang/nb/LC_MESSAGES/documentation.po index fb8e55f1..97170d04 100644 --- a/src/lang/nb/LC_MESSAGES/documentation.po +++ b/src/lang/nb/LC_MESSAGES/documentation.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Photini 2023.4.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-09-12 09:35+0100\n" +"POT-Creation-Date: 2024-09-13 10:46+0100\n" "PO-Revision-Date: 2023-04-19 08:54+0000\n" "Last-Translator: Jim Easterbrook , 2023\n" "Language: nb\n" @@ -2460,7 +2460,7 @@ msgid "" msgstr "" msgid "" -"Note that the command is ``python3``. On many machines the ``python`` " +"Note that the command is ``python3``. On some machines the ``python`` " "command still runs Python |nbsp| 2. If you do not have Python |nbsp| 3 " "installed then use your operating system's package manager to install it." msgstr "" @@ -2469,21 +2469,11 @@ msgid "You should also check what version of pip_ is installed::" msgstr "" msgid "" -"Most Linux systems suppress pip's normal version check, but I recommend " -"upgrading pip anyway::" -msgstr "" - -msgid "" -"Note that pip has installed the new version in ``/home/jim/.local`` as " -"normal users can't write to ``/usr``. (Don't be tempted to get round this by" -" using ``sudo`` to run pip. ``/usr/lib/python3/dist-packages`` should only " -"be written by the operating system's package manager.) You may need to log " -"out and then log in again to update your PATH settings. (On some Linux " -"distributions you can simply run ``source ~/.profile`` instead of logging " -"out & in.)" -msgstr "" - -msgid "Running ``pip --version`` again shows the new version::" +"Although pip_ is a Python package manager it should not be used to install " +"packges under ``/usr/lib/``. This system directory should only be used by " +"the operating system's package manager. With recent Python and pip versions " +"you have to use a virtual environment to install other packages such as " +"Photini." msgstr "" msgid "Windows" @@ -2590,7 +2580,8 @@ msgid "" "single user or for multiple users. Multi-user installations use a Python " "`virtual environment`_ to create a self contained installation that can " "easily be shared. Using a virtual environment has other advantages, such as " -"easy uninstallation, so I recommend using it for a single user installation." +"easy uninstallation, so I also recommend using it for a single user " +"installation." msgstr "" msgid "" @@ -2602,7 +2593,8 @@ msgid "" "installing PySide6 / PySide2 / PyQt6 / PyQt5 (whichever is available) with " "the package manager to ensure you install all of its system libraries and " "plugins, and so that you get the same GUI style as other Qt based " -"applications." +"applications. (Don't forget to install the QtWebEngine stuff as well if it's" +" in a seaprate package.)" msgstr "" msgid "Virtual environment" @@ -2616,14 +2608,16 @@ msgstr "" msgid "" "The option ``--system-site-packages`` makes packages installed with the " -"system package manager (e.g. PySide6 / PySide2 / PyQt6 / PyQt5) available " -"within the virtual environment. Note that pip may need to be updated again " -"from within the virtual environment." +"system package manager (e.g. PyQt6) available within the virtual " +"environment." msgstr "" msgid "" "Note that after activating the virtual environment the ``py`` command is not" -" needed. Python, pip, and other Python based commands are run directly. " +" needed. Python, pip, and other Python based commands are run directly." +msgstr "" + +msgid "" "After creating the virtual environment you should update ``pip`` as shown " "above. This ensures that the latest version will be used to install Photini." msgstr "" @@ -2647,40 +2641,76 @@ msgid "" msgstr "" msgid "" -"After installing Photini the ``photini-configure`` command can be used to " -"choose a Qt package. This allows you to try each until you find one that " -"works satisfactorily on your computer." +"I recommend PyQt rather than PySide, and Qt6 rather than Qt5. However, if " +"your operating system already has one of the packages installed then there's" +" probably no reason to use any other." msgstr "" -msgid "Initial installation" +msgid "" +"If you install more than one Qt package you can choose which one Photini " +"uses in its :doc:`configuration <../manual/configuration>`. This allows you " +"to try each until you find one that works satisfactorily on your computer." msgstr "" -msgid "Firstly install Photini with pip_:" +msgid "\"Extras\"" msgstr "" msgid "" -"Photini's optional dependencies can be included in the installation by " -"listing them as \"extras\" in the pip command. For example, if you want to " -"be able to upload to Flickr and Ipernity:" +"Photini has a number of optional extras that can be installed with pip_. " +"These are:" msgstr "" -msgid "Note that the extras' names are not case-sensitive." +msgid "flickr: Enable uploading pictures to Flickr_." msgstr "" -msgid "" -"You can install all of Photini's optional dependencies by adding an ``all`` " -"extra. You can also install any of the Qt packages as extras:" +msgid "google: Enable uploading pictures to `Google Photos`_." msgstr "" -msgid "" -"Now run the ``photini-configure`` command to choose which Qt package to use." -" (The Windows example is running Windows |nbsp| 7, so PyQt6 and PySide6 are " -"not available):" +msgid "ipernity: Enable uploading pictures to Ipernity_." +msgstr "" + +msgid "pixelfed: Enable uploading pictures to Pixelfed_ or Mastodon_." +msgstr "" + +msgid "importer: Import photos directly from a camera (not available on Windows)." +msgstr "" + +msgid "spelling: Install a spell checker for Photini's text entry fields." +msgstr "" + +msgid "gpxpy: Allow importing of GPS data from a phone tracking app or similar." +msgstr "" + +msgid "all: All of the above." +msgstr "" + +msgid "You can also choose to install one or more Qt packages:" +msgstr "" + +msgid "pyqt5" +msgstr "" + +msgid "pyqt6" +msgstr "" + +msgid "pyside2" +msgstr "" + +msgid "pyside6" +msgstr "" + +msgid "The extras are listed in square brackets when running pip_. For example::" +msgstr "" + +msgid "Note that the extras' names are not case sensitive." +msgstr "" + +msgid "Initial installation" msgstr "" msgid "" -"The command asks a series of questions, then runs pip_ to install any extra " -"dependencies that are needed, then updates your Photini configuration file." +"Firstly install Photini and any required extras with pip_. Make sure you " +"include at least one Qt package:" msgstr "" msgid "Test the installation" @@ -2711,9 +2741,8 @@ msgid "Optional dependencies" msgstr "" msgid "" -"Most of the dependencies required for Photini's optional features can also " -"be installed with ``photini-configure``. Default answers are given in square" -" brackets:" +"If you'd like to add any of the \"extras\" listed earlier to your Photini " +"installation, you just need to run pip_ again:" msgstr "" msgid "" @@ -2722,10 +2751,10 @@ msgid "" msgstr "" msgid "" -"One optional dependency that cannot be installed with pip_ or ``photini-" -"configure`` is FFmpeg_. This is used to read metadata from video files. " -"Linux & MacOS users can install it with the system package manager, but " -"installing it on Windows is non-trivial." +"One optional dependency that cannot be installed with pip_ is FFmpeg_. This " +"is used to read metadata from video files. Linux & MacOS users can install " +"it with the system package manager, but installing it on Windows is non-" +"trivial." msgstr "" msgid "Start menu / application menu" @@ -2758,9 +2787,9 @@ msgid "Localisation" msgstr "" msgid "" -"The ``photini-post-install`` command has a ``--language`` option that can " -"set the language used for the description that accompaines a desktop icon " -"(if Photini has been translated into that language)." +"The ``photini-post-install`` command has an option ``--language`` (or " +"``-l``) that can set the language used for the description that accompaines " +"a desktop icon (if Photini has been translated into that language)." msgstr "" msgid "Additional users" @@ -2779,9 +2808,10 @@ msgid "" msgstr "" msgid "" -"To install Photini menu shortcuts for all users you can run the post install" -" command as root (Linux) or in a command window run as administrator " -"(Windows). It is important to use the full path to the post install command:" +"To install Photini menu shortcuts for all users (not recommended) you can " +"run the post install command as root (Linux) or in a command window run as " +"administrator (Windows). It is important to use the full path to the post " +"install command:" msgstr "" msgid "Uninstalling Photini" @@ -2954,15 +2984,14 @@ msgid "" "can install whichever one you prefer that is available for your operating " "system. (Note that PyQt6 and PySide6 are not compatible with Windows " "versions earlier than Windows 10.) If more than one of them is installed you" -" can choose which one Photini uses by editing its :ref:`configuration file " -"` or by running ``photini-configure``." +" can choose which one Photini uses in its :doc:`configuration " +"<../manual/configuration>`" msgstr "" msgid "" "[2] Photini needs the Python interface to QtWebEngine_. This is included in " "PySide6_ and some PyQt_ or PySide2_ installations, otherwise you need to " -"install a separate package. The ``photini-configure`` command will tell you " -"if it's missing." +"install a separate package." msgstr "" msgid "" @@ -3089,12 +3118,8 @@ msgstr "" msgid "" "If you ever have problems running Photini the first thing to do is to run it" " in a command window. If you installed Photini in a `virtual environment`_ " -"then activate that environment, for example:" -msgstr "" - -msgid "" -"Start the Photini program as follows. If it fails to run you should get some" -" diagnostic information:" +"then activate that environment first. Run the Photini program as a Python " +"module. If it fails to run you should get some diagnostic information:" msgstr "" msgid "" @@ -4596,3 +4621,218 @@ msgstr "" #~ " wheel." #~ msgstr "" +#~ msgid "" +#~ "Note that the command is ``python3``. " +#~ "On many machines the ``python`` command " +#~ "still runs Python |nbsp| 2. If you" +#~ " do not have Python |nbsp| 3 " +#~ "installed then use your operating system's" +#~ " package manager to install it." +#~ msgstr "" + +#~ msgid "" +#~ "Most Linux systems suppress pip's normal" +#~ " version check, but I recommend " +#~ "upgrading pip anyway::" +#~ msgstr "" + +#~ msgid "" +#~ "Note that pip has installed the new" +#~ " version in ``/home/jim/.local`` as normal " +#~ "users can't write to ``/usr``. (Don't " +#~ "be tempted to get round this by " +#~ "using ``sudo`` to run pip. " +#~ "``/usr/lib/python3/dist-packages`` should only be" +#~ " written by the operating system's " +#~ "package manager.) You may need to log" +#~ " out and then log in again to " +#~ "update your PATH settings. (On some " +#~ "Linux distributions you can simply run " +#~ "``source ~/.profile`` instead of logging " +#~ "out & in.)" +#~ msgstr "" + +#~ msgid "Running ``pip --version`` again shows the new version::" +#~ msgstr "" + +#~ msgid "" +#~ "Before installing Photini you need to " +#~ "decide if you are installing it for" +#~ " a single user or for multiple " +#~ "users. Multi-user installations use a " +#~ "Python `virtual environment`_ to create a" +#~ " self contained installation that can " +#~ "easily be shared. Using a virtual " +#~ "environment has other advantages, such as" +#~ " easy uninstallation, so I recommend " +#~ "using it for a single user " +#~ "installation." +#~ msgstr "" + +#~ msgid "" +#~ "Linux & MacOS users have another " +#~ "decision to make - whether to install" +#~ " Photini's dependencies with pip_ or " +#~ "with the operating system's package " +#~ "manager. For a good introduction to " +#~ "the advantages and disadvantages of each" +#~ " I suggest reading `Managing Python " +#~ "packages the right way`_. All of " +#~ "Photini's dependencies can be installed " +#~ "with pip_, but I recommend installing " +#~ "PySide6 / PySide2 / PyQt6 / PyQt5 " +#~ "(whichever is available) with the package" +#~ " manager to ensure you install all " +#~ "of its system libraries and plugins, " +#~ "and so that you get the same " +#~ "GUI style as other Qt based " +#~ "applications." +#~ msgstr "" + +#~ msgid "" +#~ "The option ``--system-site-packages`` makes" +#~ " packages installed with the system " +#~ "package manager (e.g. PySide6 / PySide2 " +#~ "/ PyQt6 / PyQt5) available within the" +#~ " virtual environment. Note that pip may" +#~ " need to be updated again from " +#~ "within the virtual environment." +#~ msgstr "" + +#~ msgid "" +#~ "Note that after activating the virtual " +#~ "environment the ``py`` command is not " +#~ "needed. Python, pip, and other Python " +#~ "based commands are run directly. After " +#~ "creating the virtual environment you should" +#~ " update ``pip`` as shown above. This " +#~ "ensures that the latest version will " +#~ "be used to install Photini." +#~ msgstr "" + +#~ msgid "" +#~ "After installing Photini the ``photini-" +#~ "configure`` command can be used to " +#~ "choose a Qt package. This allows you" +#~ " to try each until you find one" +#~ " that works satisfactorily on your " +#~ "computer." +#~ msgstr "" + +#~ msgid "Firstly install Photini with pip_:" +#~ msgstr "" + +#~ msgid "" +#~ "Photini's optional dependencies can be " +#~ "included in the installation by listing " +#~ "them as \"extras\" in the pip " +#~ "command. For example, if you want to" +#~ " be able to upload to Flickr and" +#~ " Ipernity:" +#~ msgstr "" + +#~ msgid "Note that the extras' names are not case-sensitive." +#~ msgstr "" + +#~ msgid "" +#~ "You can install all of Photini's " +#~ "optional dependencies by adding an ``all``" +#~ " extra. You can also install any " +#~ "of the Qt packages as extras:" +#~ msgstr "" + +#~ msgid "" +#~ "Now run the ``photini-configure`` command" +#~ " to choose which Qt package to " +#~ "use. (The Windows example is running " +#~ "Windows |nbsp| 7, so PyQt6 and " +#~ "PySide6 are not available):" +#~ msgstr "" + +#~ msgid "" +#~ "The command asks a series of " +#~ "questions, then runs pip_ to install " +#~ "any extra dependencies that are needed, " +#~ "then updates your Photini configuration " +#~ "file." +#~ msgstr "" + +#~ msgid "" +#~ "Most of the dependencies required for " +#~ "Photini's optional features can also be " +#~ "installed with ``photini-configure``. Default " +#~ "answers are given in square brackets:" +#~ msgstr "" + +#~ msgid "" +#~ "One optional dependency that cannot be " +#~ "installed with pip_ or ``photini-" +#~ "configure`` is FFmpeg_. This is used " +#~ "to read metadata from video files. " +#~ "Linux & MacOS users can install it" +#~ " with the system package manager, but" +#~ " installing it on Windows is non-" +#~ "trivial." +#~ msgstr "" + +#~ msgid "" +#~ "The ``photini-post-install`` command has" +#~ " a ``--language`` option that can set" +#~ " the language used for the description" +#~ " that accompaines a desktop icon (if " +#~ "Photini has been translated into that " +#~ "language)." +#~ msgstr "" + +#~ msgid "" +#~ "To install Photini menu shortcuts for " +#~ "all users you can run the post " +#~ "install command as root (Linux) or in" +#~ " a command window run as administrator" +#~ " (Windows). It is important to use " +#~ "the full path to the post install " +#~ "command:" +#~ msgstr "" + +#~ msgid "" +#~ "[1] PyQt_, PySide2_, and PySide6_ are " +#~ "Python interfaces to the Qt GUI " +#~ "framework. Photini can use any of " +#~ "them (although PyQt is preferred), so " +#~ "you can install whichever one you " +#~ "prefer that is available for your " +#~ "operating system. (Note that PyQt6 and " +#~ "PySide6 are not compatible with Windows " +#~ "versions earlier than Windows 10.) If " +#~ "more than one of them is installed" +#~ " you can choose which one Photini " +#~ "uses by editing its :ref:`configuration " +#~ "file ` or by running" +#~ " ``photini-configure``." +#~ msgstr "" + +#~ msgid "" +#~ "[2] Photini needs the Python interface " +#~ "to QtWebEngine_. This is included in " +#~ "PySide6_ and some PyQt_ or PySide2_ " +#~ "installations, otherwise you need to " +#~ "install a separate package. The " +#~ "``photini-configure`` command will tell you" +#~ " if it's missing." +#~ msgstr "" + +#~ msgid "" +#~ "If you ever have problems running " +#~ "Photini the first thing to do is " +#~ "to run it in a command window. " +#~ "If you installed Photini in a " +#~ "`virtual environment`_ then activate that " +#~ "environment, for example:" +#~ msgstr "" + +#~ msgid "" +#~ "Start the Photini program as follows. " +#~ "If it fails to run you should " +#~ "get some diagnostic information:" +#~ msgstr "" + diff --git a/src/lang/pl/LC_MESSAGES/documentation.po b/src/lang/pl/LC_MESSAGES/documentation.po index dd40072d..e5b002ba 100644 --- a/src/lang/pl/LC_MESSAGES/documentation.po +++ b/src/lang/pl/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-12 09:35+0100\n" +"POT-Creation-Date: 2024-09-13 10:46+0100\n" "PO-Revision-Date: 2023-04-19 08:54+0000\n" "Last-Translator: Dawid Głaz, 2023\n" "Language: pl@qtfiletype\n" @@ -2462,7 +2462,7 @@ msgid "" msgstr "" msgid "" -"Note that the command is ``python3``. On many machines the ``python`` " +"Note that the command is ``python3``. On some machines the ``python`` " "command still runs Python |nbsp| 2. If you do not have Python |nbsp| 3 " "installed then use your operating system's package manager to install it." msgstr "" @@ -2471,21 +2471,11 @@ msgid "You should also check what version of pip_ is installed::" msgstr "" msgid "" -"Most Linux systems suppress pip's normal version check, but I recommend " -"upgrading pip anyway::" -msgstr "" - -msgid "" -"Note that pip has installed the new version in ``/home/jim/.local`` as " -"normal users can't write to ``/usr``. (Don't be tempted to get round this by" -" using ``sudo`` to run pip. ``/usr/lib/python3/dist-packages`` should only " -"be written by the operating system's package manager.) You may need to log " -"out and then log in again to update your PATH settings. (On some Linux " -"distributions you can simply run ``source ~/.profile`` instead of logging " -"out & in.)" -msgstr "" - -msgid "Running ``pip --version`` again shows the new version::" +"Although pip_ is a Python package manager it should not be used to install " +"packges under ``/usr/lib/``. This system directory should only be used by " +"the operating system's package manager. With recent Python and pip versions " +"you have to use a virtual environment to install other packages such as " +"Photini." msgstr "" msgid "Windows" @@ -2592,7 +2582,8 @@ msgid "" "single user or for multiple users. Multi-user installations use a Python " "`virtual environment`_ to create a self contained installation that can " "easily be shared. Using a virtual environment has other advantages, such as " -"easy uninstallation, so I recommend using it for a single user installation." +"easy uninstallation, so I also recommend using it for a single user " +"installation." msgstr "" msgid "" @@ -2604,7 +2595,8 @@ msgid "" "installing PySide6 / PySide2 / PyQt6 / PyQt5 (whichever is available) with " "the package manager to ensure you install all of its system libraries and " "plugins, and so that you get the same GUI style as other Qt based " -"applications." +"applications. (Don't forget to install the QtWebEngine stuff as well if it's" +" in a seaprate package.)" msgstr "" msgid "Virtual environment" @@ -2618,14 +2610,16 @@ msgstr "" msgid "" "The option ``--system-site-packages`` makes packages installed with the " -"system package manager (e.g. PySide6 / PySide2 / PyQt6 / PyQt5) available " -"within the virtual environment. Note that pip may need to be updated again " -"from within the virtual environment." +"system package manager (e.g. PyQt6) available within the virtual " +"environment." msgstr "" msgid "" "Note that after activating the virtual environment the ``py`` command is not" -" needed. Python, pip, and other Python based commands are run directly. " +" needed. Python, pip, and other Python based commands are run directly." +msgstr "" + +msgid "" "After creating the virtual environment you should update ``pip`` as shown " "above. This ensures that the latest version will be used to install Photini." msgstr "" @@ -2649,40 +2643,76 @@ msgid "" msgstr "" msgid "" -"After installing Photini the ``photini-configure`` command can be used to " -"choose a Qt package. This allows you to try each until you find one that " -"works satisfactorily on your computer." +"I recommend PyQt rather than PySide, and Qt6 rather than Qt5. However, if " +"your operating system already has one of the packages installed then there's" +" probably no reason to use any other." msgstr "" -msgid "Initial installation" +msgid "" +"If you install more than one Qt package you can choose which one Photini " +"uses in its :doc:`configuration <../manual/configuration>`. This allows you " +"to try each until you find one that works satisfactorily on your computer." msgstr "" -msgid "Firstly install Photini with pip_:" +msgid "\"Extras\"" msgstr "" msgid "" -"Photini's optional dependencies can be included in the installation by " -"listing them as \"extras\" in the pip command. For example, if you want to " -"be able to upload to Flickr and Ipernity:" +"Photini has a number of optional extras that can be installed with pip_. " +"These are:" msgstr "" -msgid "Note that the extras' names are not case-sensitive." +msgid "flickr: Enable uploading pictures to Flickr_." msgstr "" -msgid "" -"You can install all of Photini's optional dependencies by adding an ``all`` " -"extra. You can also install any of the Qt packages as extras:" +msgid "google: Enable uploading pictures to `Google Photos`_." msgstr "" -msgid "" -"Now run the ``photini-configure`` command to choose which Qt package to use." -" (The Windows example is running Windows |nbsp| 7, so PyQt6 and PySide6 are " -"not available):" +msgid "ipernity: Enable uploading pictures to Ipernity_." +msgstr "" + +msgid "pixelfed: Enable uploading pictures to Pixelfed_ or Mastodon_." +msgstr "" + +msgid "importer: Import photos directly from a camera (not available on Windows)." +msgstr "" + +msgid "spelling: Install a spell checker for Photini's text entry fields." +msgstr "" + +msgid "gpxpy: Allow importing of GPS data from a phone tracking app or similar." +msgstr "" + +msgid "all: All of the above." +msgstr "" + +msgid "You can also choose to install one or more Qt packages:" +msgstr "" + +msgid "pyqt5" +msgstr "" + +msgid "pyqt6" +msgstr "" + +msgid "pyside2" +msgstr "" + +msgid "pyside6" +msgstr "" + +msgid "The extras are listed in square brackets when running pip_. For example::" +msgstr "" + +msgid "Note that the extras' names are not case sensitive." +msgstr "" + +msgid "Initial installation" msgstr "" msgid "" -"The command asks a series of questions, then runs pip_ to install any extra " -"dependencies that are needed, then updates your Photini configuration file." +"Firstly install Photini and any required extras with pip_. Make sure you " +"include at least one Qt package:" msgstr "" msgid "Test the installation" @@ -2713,9 +2743,8 @@ msgid "Optional dependencies" msgstr "" msgid "" -"Most of the dependencies required for Photini's optional features can also " -"be installed with ``photini-configure``. Default answers are given in square" -" brackets:" +"If you'd like to add any of the \"extras\" listed earlier to your Photini " +"installation, you just need to run pip_ again:" msgstr "" msgid "" @@ -2724,10 +2753,10 @@ msgid "" msgstr "" msgid "" -"One optional dependency that cannot be installed with pip_ or ``photini-" -"configure`` is FFmpeg_. This is used to read metadata from video files. " -"Linux & MacOS users can install it with the system package manager, but " -"installing it on Windows is non-trivial." +"One optional dependency that cannot be installed with pip_ is FFmpeg_. This " +"is used to read metadata from video files. Linux & MacOS users can install " +"it with the system package manager, but installing it on Windows is non-" +"trivial." msgstr "" msgid "Start menu / application menu" @@ -2760,9 +2789,9 @@ msgid "Localisation" msgstr "" msgid "" -"The ``photini-post-install`` command has a ``--language`` option that can " -"set the language used for the description that accompaines a desktop icon " -"(if Photini has been translated into that language)." +"The ``photini-post-install`` command has an option ``--language`` (or " +"``-l``) that can set the language used for the description that accompaines " +"a desktop icon (if Photini has been translated into that language)." msgstr "" msgid "Additional users" @@ -2781,9 +2810,10 @@ msgid "" msgstr "" msgid "" -"To install Photini menu shortcuts for all users you can run the post install" -" command as root (Linux) or in a command window run as administrator " -"(Windows). It is important to use the full path to the post install command:" +"To install Photini menu shortcuts for all users (not recommended) you can " +"run the post install command as root (Linux) or in a command window run as " +"administrator (Windows). It is important to use the full path to the post " +"install command:" msgstr "" msgid "Uninstalling Photini" @@ -2956,15 +2986,14 @@ msgid "" "can install whichever one you prefer that is available for your operating " "system. (Note that PyQt6 and PySide6 are not compatible with Windows " "versions earlier than Windows 10.) If more than one of them is installed you" -" can choose which one Photini uses by editing its :ref:`configuration file " -"` or by running ``photini-configure``." +" can choose which one Photini uses in its :doc:`configuration " +"<../manual/configuration>`" msgstr "" msgid "" "[2] Photini needs the Python interface to QtWebEngine_. This is included in " "PySide6_ and some PyQt_ or PySide2_ installations, otherwise you need to " -"install a separate package. The ``photini-configure`` command will tell you " -"if it's missing." +"install a separate package." msgstr "" msgid "" @@ -3091,12 +3120,8 @@ msgstr "" msgid "" "If you ever have problems running Photini the first thing to do is to run it" " in a command window. If you installed Photini in a `virtual environment`_ " -"then activate that environment, for example:" -msgstr "" - -msgid "" -"Start the Photini program as follows. If it fails to run you should get some" -" diagnostic information:" +"then activate that environment first. Run the Photini program as a Python " +"module. If it fails to run you should get some diagnostic information:" msgstr "" msgid "" @@ -4598,3 +4623,218 @@ msgstr "" #~ " wheel." #~ msgstr "" +#~ msgid "" +#~ "Note that the command is ``python3``. " +#~ "On many machines the ``python`` command " +#~ "still runs Python |nbsp| 2. If you" +#~ " do not have Python |nbsp| 3 " +#~ "installed then use your operating system's" +#~ " package manager to install it." +#~ msgstr "" + +#~ msgid "" +#~ "Most Linux systems suppress pip's normal" +#~ " version check, but I recommend " +#~ "upgrading pip anyway::" +#~ msgstr "" + +#~ msgid "" +#~ "Note that pip has installed the new" +#~ " version in ``/home/jim/.local`` as normal " +#~ "users can't write to ``/usr``. (Don't " +#~ "be tempted to get round this by " +#~ "using ``sudo`` to run pip. " +#~ "``/usr/lib/python3/dist-packages`` should only be" +#~ " written by the operating system's " +#~ "package manager.) You may need to log" +#~ " out and then log in again to " +#~ "update your PATH settings. (On some " +#~ "Linux distributions you can simply run " +#~ "``source ~/.profile`` instead of logging " +#~ "out & in.)" +#~ msgstr "" + +#~ msgid "Running ``pip --version`` again shows the new version::" +#~ msgstr "" + +#~ msgid "" +#~ "Before installing Photini you need to " +#~ "decide if you are installing it for" +#~ " a single user or for multiple " +#~ "users. Multi-user installations use a " +#~ "Python `virtual environment`_ to create a" +#~ " self contained installation that can " +#~ "easily be shared. Using a virtual " +#~ "environment has other advantages, such as" +#~ " easy uninstallation, so I recommend " +#~ "using it for a single user " +#~ "installation." +#~ msgstr "" + +#~ msgid "" +#~ "Linux & MacOS users have another " +#~ "decision to make - whether to install" +#~ " Photini's dependencies with pip_ or " +#~ "with the operating system's package " +#~ "manager. For a good introduction to " +#~ "the advantages and disadvantages of each" +#~ " I suggest reading `Managing Python " +#~ "packages the right way`_. All of " +#~ "Photini's dependencies can be installed " +#~ "with pip_, but I recommend installing " +#~ "PySide6 / PySide2 / PyQt6 / PyQt5 " +#~ "(whichever is available) with the package" +#~ " manager to ensure you install all " +#~ "of its system libraries and plugins, " +#~ "and so that you get the same " +#~ "GUI style as other Qt based " +#~ "applications." +#~ msgstr "" + +#~ msgid "" +#~ "The option ``--system-site-packages`` makes" +#~ " packages installed with the system " +#~ "package manager (e.g. PySide6 / PySide2 " +#~ "/ PyQt6 / PyQt5) available within the" +#~ " virtual environment. Note that pip may" +#~ " need to be updated again from " +#~ "within the virtual environment." +#~ msgstr "" + +#~ msgid "" +#~ "Note that after activating the virtual " +#~ "environment the ``py`` command is not " +#~ "needed. Python, pip, and other Python " +#~ "based commands are run directly. After " +#~ "creating the virtual environment you should" +#~ " update ``pip`` as shown above. This " +#~ "ensures that the latest version will " +#~ "be used to install Photini." +#~ msgstr "" + +#~ msgid "" +#~ "After installing Photini the ``photini-" +#~ "configure`` command can be used to " +#~ "choose a Qt package. This allows you" +#~ " to try each until you find one" +#~ " that works satisfactorily on your " +#~ "computer." +#~ msgstr "" + +#~ msgid "Firstly install Photini with pip_:" +#~ msgstr "" + +#~ msgid "" +#~ "Photini's optional dependencies can be " +#~ "included in the installation by listing " +#~ "them as \"extras\" in the pip " +#~ "command. For example, if you want to" +#~ " be able to upload to Flickr and" +#~ " Ipernity:" +#~ msgstr "" + +#~ msgid "Note that the extras' names are not case-sensitive." +#~ msgstr "" + +#~ msgid "" +#~ "You can install all of Photini's " +#~ "optional dependencies by adding an ``all``" +#~ " extra. You can also install any " +#~ "of the Qt packages as extras:" +#~ msgstr "" + +#~ msgid "" +#~ "Now run the ``photini-configure`` command" +#~ " to choose which Qt package to " +#~ "use. (The Windows example is running " +#~ "Windows |nbsp| 7, so PyQt6 and " +#~ "PySide6 are not available):" +#~ msgstr "" + +#~ msgid "" +#~ "The command asks a series of " +#~ "questions, then runs pip_ to install " +#~ "any extra dependencies that are needed, " +#~ "then updates your Photini configuration " +#~ "file." +#~ msgstr "" + +#~ msgid "" +#~ "Most of the dependencies required for " +#~ "Photini's optional features can also be " +#~ "installed with ``photini-configure``. Default " +#~ "answers are given in square brackets:" +#~ msgstr "" + +#~ msgid "" +#~ "One optional dependency that cannot be " +#~ "installed with pip_ or ``photini-" +#~ "configure`` is FFmpeg_. This is used " +#~ "to read metadata from video files. " +#~ "Linux & MacOS users can install it" +#~ " with the system package manager, but" +#~ " installing it on Windows is non-" +#~ "trivial." +#~ msgstr "" + +#~ msgid "" +#~ "The ``photini-post-install`` command has" +#~ " a ``--language`` option that can set" +#~ " the language used for the description" +#~ " that accompaines a desktop icon (if " +#~ "Photini has been translated into that " +#~ "language)." +#~ msgstr "" + +#~ msgid "" +#~ "To install Photini menu shortcuts for " +#~ "all users you can run the post " +#~ "install command as root (Linux) or in" +#~ " a command window run as administrator" +#~ " (Windows). It is important to use " +#~ "the full path to the post install " +#~ "command:" +#~ msgstr "" + +#~ msgid "" +#~ "[1] PyQt_, PySide2_, and PySide6_ are " +#~ "Python interfaces to the Qt GUI " +#~ "framework. Photini can use any of " +#~ "them (although PyQt is preferred), so " +#~ "you can install whichever one you " +#~ "prefer that is available for your " +#~ "operating system. (Note that PyQt6 and " +#~ "PySide6 are not compatible with Windows " +#~ "versions earlier than Windows 10.) If " +#~ "more than one of them is installed" +#~ " you can choose which one Photini " +#~ "uses by editing its :ref:`configuration " +#~ "file ` or by running" +#~ " ``photini-configure``." +#~ msgstr "" + +#~ msgid "" +#~ "[2] Photini needs the Python interface " +#~ "to QtWebEngine_. This is included in " +#~ "PySide6_ and some PyQt_ or PySide2_ " +#~ "installations, otherwise you need to " +#~ "install a separate package. The " +#~ "``photini-configure`` command will tell you" +#~ " if it's missing." +#~ msgstr "" + +#~ msgid "" +#~ "If you ever have problems running " +#~ "Photini the first thing to do is " +#~ "to run it in a command window. " +#~ "If you installed Photini in a " +#~ "`virtual environment`_ then activate that " +#~ "environment, for example:" +#~ msgstr "" + +#~ msgid "" +#~ "Start the Photini program as follows. " +#~ "If it fails to run you should " +#~ "get some diagnostic information:" +#~ msgstr "" + diff --git a/src/lang/templates/gettext/documentation.pot b/src/lang/templates/gettext/documentation.pot index 3a5009b5..923d1073 100644 --- a/src/lang/templates/gettext/documentation.pot +++ b/src/lang/templates/gettext/documentation.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Photini 2024.8.2.post121\n" +"Project-Id-Version: Photini 2024.8.2.post126\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-09-12 09:35+0100\n" +"POT-Creation-Date: 2024-09-13 10:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1462,19 +1462,13 @@ msgstr "" msgid "Python should already be installed, but make sure you have Python |nbsp| 3. Open a terminal window and run the ``python3`` command::" msgstr "" -msgid "Note that the command is ``python3``. On many machines the ``python`` command still runs Python |nbsp| 2. If you do not have Python |nbsp| 3 installed then use your operating system's package manager to install it." +msgid "Note that the command is ``python3``. On some machines the ``python`` command still runs Python |nbsp| 2. If you do not have Python |nbsp| 3 installed then use your operating system's package manager to install it." msgstr "" msgid "You should also check what version of pip_ is installed::" msgstr "" -msgid "Most Linux systems suppress pip's normal version check, but I recommend upgrading pip anyway::" -msgstr "" - -msgid "Note that pip has installed the new version in ``/home/jim/.local`` as normal users can't write to ``/usr``. (Don't be tempted to get round this by using ``sudo`` to run pip. ``/usr/lib/python3/dist-packages`` should only be written by the operating system's package manager.) You may need to log out and then log in again to update your PATH settings. (On some Linux distributions you can simply run ``source ~/.profile`` instead of logging out & in.)" -msgstr "" - -msgid "Running ``pip --version`` again shows the new version::" +msgid "Although pip_ is a Python package manager it should not be used to install packges under ``/usr/lib/``. This system directory should only be used by the operating system's package manager. With recent Python and pip versions you have to use a virtual environment to install other packages such as Photini." msgstr "" msgid "Windows" @@ -1543,10 +1537,10 @@ msgstr "" msgid "Installing Photini" msgstr "" -msgid "Before installing Photini you need to decide if you are installing it for a single user or for multiple users. Multi-user installations use a Python `virtual environment`_ to create a self contained installation that can easily be shared. Using a virtual environment has other advantages, such as easy uninstallation, so I recommend using it for a single user installation." +msgid "Before installing Photini you need to decide if you are installing it for a single user or for multiple users. Multi-user installations use a Python `virtual environment`_ to create a self contained installation that can easily be shared. Using a virtual environment has other advantages, such as easy uninstallation, so I also recommend using it for a single user installation." msgstr "" -msgid "Linux & MacOS users have another decision to make - whether to install Photini's dependencies with pip_ or with the operating system's package manager. For a good introduction to the advantages and disadvantages of each I suggest reading `Managing Python packages the right way`_. All of Photini's dependencies can be installed with pip_, but I recommend installing PySide6 / PySide2 / PyQt6 / PyQt5 (whichever is available) with the package manager to ensure you install all of its system libraries and plugins, and so that you get the same GUI style as other Qt based applications." +msgid "Linux & MacOS users have another decision to make - whether to install Photini's dependencies with pip_ or with the operating system's package manager. For a good introduction to the advantages and disadvantages of each I suggest reading `Managing Python packages the right way`_. All of Photini's dependencies can be installed with pip_, but I recommend installing PySide6 / PySide2 / PyQt6 / PyQt5 (whichever is available) with the package manager to ensure you install all of its system libraries and plugins, and so that you get the same GUI style as other Qt based applications. (Don't forget to install the QtWebEngine stuff as well if it's in a seaprate package.)" msgstr "" msgid "Virtual environment" @@ -1555,10 +1549,13 @@ msgstr "" msgid "If you are using a virtual environment you should set it up now. You can create a virtual environment in any writeable directory. I use the name ``photini`` and create it in my home directory:" msgstr "" -msgid "The option ``--system-site-packages`` makes packages installed with the system package manager (e.g. PySide6 / PySide2 / PyQt6 / PyQt5) available within the virtual environment. Note that pip may need to be updated again from within the virtual environment." +msgid "The option ``--system-site-packages`` makes packages installed with the system package manager (e.g. PyQt6) available within the virtual environment." msgstr "" -msgid "Note that after activating the virtual environment the ``py`` command is not needed. Python, pip, and other Python based commands are run directly. After creating the virtual environment you should update ``pip`` as shown above. This ensures that the latest version will be used to install Photini." +msgid "Note that after activating the virtual environment the ``py`` command is not needed. Python, pip, and other Python based commands are run directly." +msgstr "" + +msgid "After creating the virtual environment you should update ``pip`` as shown above. This ensures that the latest version will be used to install Photini." msgstr "" msgid "You should stay in this virtual environment while installing and testing Photini. After that Photini can be run without activating the virtual environment." @@ -1570,28 +1567,67 @@ msgstr "" msgid "Photini uses the Qt_ Framework for its graphical user interface. There are two current versions of Qt (Qt5 and Qt6) and each has two Python interfaces (PyQt and PySide). Hence there are four Python Qt packages - PyQt5, PyQt6, PySide2, and PySide6. Photini works with any one of these, but there isn't one of them that works on all platforms. For example, Qt6 does not work on Windows versions earlier than Windows |nbsp| 10." msgstr "" -msgid "After installing Photini the ``photini-configure`` command can be used to choose a Qt package. This allows you to try each until you find one that works satisfactorily on your computer." +msgid "I recommend PyQt rather than PySide, and Qt6 rather than Qt5. However, if your operating system already has one of the packages installed then there's probably no reason to use any other." msgstr "" -msgid "Initial installation" +msgid "If you install more than one Qt package you can choose which one Photini uses in its :doc:`configuration <../manual/configuration>`. This allows you to try each until you find one that works satisfactorily on your computer." +msgstr "" + +msgid "\"Extras\"" +msgstr "" + +msgid "Photini has a number of optional extras that can be installed with pip_. These are:" +msgstr "" + +msgid "flickr: Enable uploading pictures to Flickr_." +msgstr "" + +msgid "google: Enable uploading pictures to `Google Photos`_." +msgstr "" + +msgid "ipernity: Enable uploading pictures to Ipernity_." +msgstr "" + +msgid "pixelfed: Enable uploading pictures to Pixelfed_ or Mastodon_." +msgstr "" + +msgid "importer: Import photos directly from a camera (not available on Windows)." +msgstr "" + +msgid "spelling: Install a spell checker for Photini's text entry fields." +msgstr "" + +msgid "gpxpy: Allow importing of GPS data from a phone tracking app or similar." +msgstr "" + +msgid "all: All of the above." msgstr "" -msgid "Firstly install Photini with pip_:" +msgid "You can also choose to install one or more Qt packages:" msgstr "" -msgid "Photini's optional dependencies can be included in the installation by listing them as \"extras\" in the pip command. For example, if you want to be able to upload to Flickr and Ipernity:" +msgid "pyqt5" msgstr "" -msgid "Note that the extras' names are not case-sensitive." +msgid "pyqt6" msgstr "" -msgid "You can install all of Photini's optional dependencies by adding an ``all`` extra. You can also install any of the Qt packages as extras:" +msgid "pyside2" msgstr "" -msgid "Now run the ``photini-configure`` command to choose which Qt package to use. (The Windows example is running Windows |nbsp| 7, so PyQt6 and PySide6 are not available):" +msgid "pyside6" msgstr "" -msgid "The command asks a series of questions, then runs pip_ to install any extra dependencies that are needed, then updates your Photini configuration file." +msgid "The extras are listed in square brackets when running pip_. For example::" +msgstr "" + +msgid "Note that the extras' names are not case sensitive." +msgstr "" + +msgid "Initial installation" +msgstr "" + +msgid "Firstly install Photini and any required extras with pip_. Make sure you include at least one Qt package:" msgstr "" msgid "Test the installation" @@ -1612,13 +1648,13 @@ msgstr "" msgid "Optional dependencies" msgstr "" -msgid "Most of the dependencies required for Photini's optional features can also be installed with ``photini-configure``. Default answers are given in square brackets:" +msgid "If you'd like to add any of the \"extras\" listed earlier to your Photini installation, you just need to run pip_ again:" msgstr "" msgid "Photini's spelling checker may require some other files to be installed. See the `pyenchant documentation`_ for platform specific instructions." msgstr "" -msgid "One optional dependency that cannot be installed with pip_ or ``photini-configure`` is FFmpeg_. This is used to read metadata from video files. Linux & MacOS users can install it with the system package manager, but installing it on Windows is non-trivial." +msgid "One optional dependency that cannot be installed with pip_ is FFmpeg_. This is used to read metadata from video files. Linux & MacOS users can install it with the system package manager, but installing it on Windows is non-trivial." msgstr "" msgid "Start menu / application menu" @@ -1639,7 +1675,7 @@ msgstr "" msgid "Localisation" msgstr "" -msgid "The ``photini-post-install`` command has a ``--language`` option that can set the language used for the description that accompaines a desktop icon (if Photini has been translated into that language)." +msgid "The ``photini-post-install`` command has an option ``--language`` (or ``-l``) that can set the language used for the description that accompaines a desktop icon (if Photini has been translated into that language)." msgstr "" msgid "Additional users" @@ -1651,7 +1687,7 @@ msgstr "" msgid "This is not a very convenient way to run Photini, so most users will want to add it to their start / application menu:" msgstr "" -msgid "To install Photini menu shortcuts for all users you can run the post install command as root (Linux) or in a command window run as administrator (Windows). It is important to use the full path to the post install command:" +msgid "To install Photini menu shortcuts for all users (not recommended) you can run the post install command as root (Linux) or in a command window run as administrator (Windows). It is important to use the full path to the post install command:" msgstr "" msgid "Uninstalling Photini" @@ -1795,10 +1831,10 @@ msgstr "" msgid "requests" msgstr "" -msgid "[1] PyQt_, PySide2_, and PySide6_ are Python interfaces to the Qt GUI framework. Photini can use any of them (although PyQt is preferred), so you can install whichever one you prefer that is available for your operating system. (Note that PyQt6 and PySide6 are not compatible with Windows versions earlier than Windows 10.) If more than one of them is installed you can choose which one Photini uses by editing its :ref:`configuration file ` or by running ``photini-configure``." +msgid "[1] PyQt_, PySide2_, and PySide6_ are Python interfaces to the Qt GUI framework. Photini can use any of them (although PyQt is preferred), so you can install whichever one you prefer that is available for your operating system. (Note that PyQt6 and PySide6 are not compatible with Windows versions earlier than Windows 10.) If more than one of them is installed you can choose which one Photini uses in its :doc:`configuration <../manual/configuration>`" msgstr "" -msgid "[2] Photini needs the Python interface to QtWebEngine_. This is included in PySide6_ and some PyQt_ or PySide2_ installations, otherwise you need to install a separate package. The ``photini-configure`` command will tell you if it's missing." +msgid "[2] Photini needs the Python interface to QtWebEngine_. This is included in PySide6_ and some PyQt_ or PySide2_ installations, otherwise you need to install a separate package." msgstr "" msgid "Some of Photini's features are optional - if you don't install these packages Photini will work but the relevant feature will not be available. Linux package manager names will probably have ``python-`` or ``python3-`` prefixes." @@ -1894,10 +1930,7 @@ msgstr "" msgid "Troubleshooting" msgstr "" -msgid "If you ever have problems running Photini the first thing to do is to run it in a command window. If you installed Photini in a `virtual environment`_ then activate that environment, for example:" -msgstr "" - -msgid "Start the Photini program as follows. If it fails to run you should get some diagnostic information:" +msgid "If you ever have problems running Photini the first thing to do is to run it in a command window. If you installed Photini in a `virtual environment`_ then activate that environment first. Run the Photini program as a Python module. If it fails to run you should get some diagnostic information:" msgstr "" msgid "Note the use of the ``-v`` option to increase the verbosity of Photini's message logging. This option can be repeated for even more verbosity."