Skip to content

Commit

Permalink
Merge pull request #205 from jim-easterbrook/devel
Browse files Browse the repository at this point in the history
Update installation documentation
  • Loading branch information
jim-easterbrook committed Jul 6, 2023
2 parents cb79401 + 0164319 commit 0a01159
Show file tree
Hide file tree
Showing 11 changed files with 930 additions and 340 deletions.
564 changes: 348 additions & 216 deletions src/doc/other/installation.rst

Large diffs are not rendered by default.

79 changes: 66 additions & 13 deletions src/lang/ca/LC_MESSAGES/documentation.po
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-04 13:23+0100\n"
"POT-Creation-Date: 2023-07-06 11:34+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: Joan <[email protected]>, 2023\n"
"Language: ca\n"
Expand Down Expand Up @@ -2457,7 +2457,8 @@ msgid ""
"normal users can't write to ``/usr``. (Don't be tempted to get round this by"
" using ``sudo`` to run pip. ``/usr`` 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."
" 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::"
Expand Down Expand Up @@ -2572,7 +2573,10 @@ msgid ""
"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:"
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 ""
Expand Down Expand Up @@ -2609,7 +2613,8 @@ msgstr ""

msgid ""
"Most of the dependencies required for Photini's optional features can also "
"be installed with ``photini-configure``:"
"be installed with ``photini-configure``. Default answers are given in square"
" brackets:"
msgstr ""

msgid ""
Expand Down Expand Up @@ -2807,13 +2812,12 @@ msgstr ""

msgid ""
"[1] PyQt_, PySide2_, and PySide6_ are Python interfaces to the Qt GUI "
"framework. Photini can use any of them (although PySide2 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 <configuration-pyqt>` or by running ``photini-"
"configure``."
"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 "
"<configuration-pyqt>` or by running ``photini-configure``."
msgstr ""

msgid ""
Expand Down Expand Up @@ -2933,8 +2937,7 @@ msgstr ""

msgid ""
"If you'd like to test or use one of Photini's translation files you will "
"need to update and compile the translations before installing or running "
"Photini::"
"need to update the translations before installing or running Photini::"
msgstr ""

msgid ""
Expand Down Expand Up @@ -3962,3 +3965,53 @@ msgstr ""
#~ "remove it from the start/application menu:"
#~ 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`` "
#~ "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."
#~ msgstr ""

#~ msgid ""
#~ "Now run the ``photini-configure`` command"
#~ " to choose which Qt package to "
#~ "use:"
#~ msgstr ""

#~ msgid ""
#~ "Most of the dependencies required for "
#~ "Photini's optional features can also be "
#~ "installed with ``photini-configure``:"
#~ msgstr ""

#~ msgid ""
#~ "[1] PyQt_, PySide2_, and PySide6_ are "
#~ "Python interfaces to the Qt GUI "
#~ "framework. Photini can use any of "
#~ "them (although PySide2 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 <configuration-pyqt>` or by running"
#~ " ``photini-configure``."
#~ msgstr ""

#~ msgid ""
#~ "If you'd like to test or use "
#~ "one of Photini's translation files you "
#~ "will need to update and compile the"
#~ " translations before installing or running "
#~ "Photini::"
#~ msgstr ""

67 changes: 54 additions & 13 deletions src/lang/cs/LC_MESSAGES/documentation.po
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-04 13:23+0100\n"
"POT-Creation-Date: 2023-07-06 11:34+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: fri, 2023\n"
"Language: cs@qtfiletype\n"
Expand Down Expand Up @@ -2461,12 +2461,14 @@ 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`` 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."
" 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 "
Expand Down Expand Up @@ -2618,7 +2620,10 @@ msgid ""
"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:"
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 ""
Expand Down Expand Up @@ -2658,7 +2663,8 @@ msgstr "Volitelné závislosti"

msgid ""
"Most of the dependencies required for Photini's optional features can also "
"be installed with ``photini-configure``:"
"be installed with ``photini-configure``. Default answers are given in square"
" brackets:"
msgstr ""

msgid ""
Expand Down Expand Up @@ -2898,13 +2904,12 @@ msgstr "vyžaduje"

msgid ""
"[1] PyQt_, PySide2_, and PySide6_ are Python interfaces to the Qt GUI "
"framework. Photini can use any of them (although PySide2 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 <configuration-pyqt>` or by running ``photini-"
"configure``."
"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 "
"<configuration-pyqt>` or by running ``photini-configure``."
msgstr ""

msgid ""
Expand Down Expand Up @@ -3035,8 +3040,7 @@ msgstr ""

msgid ""
"If you'd like to test or use one of Photini's translation files you will "
"need to update and compile the translations before installing or running "
"Photini::"
"need to update the translations before installing or running Photini::"
msgstr ""

msgid ""
Expand Down Expand Up @@ -4028,3 +4032,40 @@ msgstr ""
#~ "error message doesn't tell you that!"
#~ msgstr ""

#~ msgid ""
#~ "Now run the ``photini-configure`` command"
#~ " to choose which Qt package to "
#~ "use:"
#~ msgstr ""

#~ msgid ""
#~ "Most of the dependencies required for "
#~ "Photini's optional features can also be "
#~ "installed with ``photini-configure``:"
#~ msgstr ""

#~ msgid ""
#~ "[1] PyQt_, PySide2_, and PySide6_ are "
#~ "Python interfaces to the Qt GUI "
#~ "framework. Photini can use any of "
#~ "them (although PySide2 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 <configuration-pyqt>` or by running"
#~ " ``photini-configure``."
#~ msgstr ""

#~ msgid ""
#~ "If you'd like to test or use "
#~ "one of Photini's translation files you "
#~ "will need to update and compile the"
#~ " translations before installing or running "
#~ "Photini::"
#~ msgstr ""

79 changes: 66 additions & 13 deletions src/lang/de/LC_MESSAGES/documentation.po
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-04 13:23+0100\n"
"POT-Creation-Date: 2023-07-06 11:34+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: Jim Easterbrook <[email protected]>, 2023\n"
"Language: de\n"
Expand Down Expand Up @@ -2450,7 +2450,8 @@ msgid ""
"normal users can't write to ``/usr``. (Don't be tempted to get round this by"
" using ``sudo`` to run pip. ``/usr`` 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."
" 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::"
Expand Down Expand Up @@ -2566,7 +2567,10 @@ msgid ""
"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:"
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 ""
Expand Down Expand Up @@ -2603,7 +2607,8 @@ msgstr "Optionale Abhängigkeiten"

msgid ""
"Most of the dependencies required for Photini's optional features can also "
"be installed with ``photini-configure``:"
"be installed with ``photini-configure``. Default answers are given in square"
" brackets:"
msgstr ""

msgid ""
Expand Down Expand Up @@ -2801,13 +2806,12 @@ msgstr ""

msgid ""
"[1] PyQt_, PySide2_, and PySide6_ are Python interfaces to the Qt GUI "
"framework. Photini can use any of them (although PySide2 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 <configuration-pyqt>` or by running ``photini-"
"configure``."
"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 "
"<configuration-pyqt>` or by running ``photini-configure``."
msgstr ""

msgid ""
Expand Down Expand Up @@ -2927,8 +2931,7 @@ msgstr ""

msgid ""
"If you'd like to test or use one of Photini's translation files you will "
"need to update and compile the translations before installing or running "
"Photini::"
"need to update the translations before installing or running Photini::"
msgstr ""

msgid ""
Expand Down Expand Up @@ -3956,3 +3959,53 @@ msgstr ""
#~ "remove it from the start/application menu:"
#~ 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`` "
#~ "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."
#~ msgstr ""

#~ msgid ""
#~ "Now run the ``photini-configure`` command"
#~ " to choose which Qt package to "
#~ "use:"
#~ msgstr ""

#~ msgid ""
#~ "Most of the dependencies required for "
#~ "Photini's optional features can also be "
#~ "installed with ``photini-configure``:"
#~ msgstr ""

#~ msgid ""
#~ "[1] PyQt_, PySide2_, and PySide6_ are "
#~ "Python interfaces to the Qt GUI "
#~ "framework. Photini can use any of "
#~ "them (although PySide2 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 <configuration-pyqt>` or by running"
#~ " ``photini-configure``."
#~ msgstr ""

#~ msgid ""
#~ "If you'd like to test or use "
#~ "one of Photini's translation files you "
#~ "will need to update and compile the"
#~ " translations before installing or running "
#~ "Photini::"
#~ msgstr ""

Loading

0 comments on commit 0a01159

Please sign in to comment.