Merge pull request #300 from jim-easterbrook/devel

Devel
jim-easterbrook · Nov 5, 2024 · 5a4ceb7 · 5a4ceb7
2 parents b355c5a + 56d1b13
commit 5a4ceb7
Show file tree

Hide file tree

Showing 13 changed files with 186 additions and 52 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -18,6 +18,7 @@ along with this program.  If not, see
 
 Changes in v2024.11.0:
   1/ Sync of hierarchical and "flat" keywords is now automatic.
+  2/ Importer "refresh" button now reloads file list.
 
 Changes in v2024.10.0:
   1/ New hierarchical tags editor.

diff --git a/src/doc/manual/importer.rst b/src/doc/manual/importer.rst
@@ -1,5 +1,5 @@
 .. This is part of the Photini documentation.
-   Copyright (C)  2012-19  Jim Easterbrook.
+   Copyright (C)  2012-24  Jim Easterbrook.
    See the file ../DOC_LICENSE.txt for copying conditions.
 
 Image importer
@@ -41,7 +41,7 @@ For example, I use ``/home/jim/Pictures/from_camera/%Y/%Y_%m_%d/100D_{name}`` fo
 
 .. image:: ../images/screenshot_180.png
 
-After connecting one or more cameras and pressing the ``refresh`` button, a camera can be chosen from the ``<select source>`` drop down list.
+After connecting one or more cameras, one of them can be chosen from the ``<select source>`` drop down list.
 Photini then fetches a list of all the files stored on the camera, which can take some time.
 
 The drop down list also includes the most recent source folders you have used.
@@ -53,6 +53,8 @@ It is sorted by name or date, as selected by the buttons below the image thumbna
 
 .. image:: ../images/screenshot_181.png
 
+The ``refresh`` button regenerates the file list, which may be useful if you use another program to add files to the current folder.
+
 When the ``Target format`` has been set to match where previous images were put, images that have already been copied to the computer are non selectable (shown in light grey).
 
 .. image:: ../images/screenshot_182.png

diff --git 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-10-26 16:35+0100\n"
+"POT-Creation-Date: 2024-11-04 17:25+0000\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: Joan <[email protected]>, 2023\n"
 "Language: ca\n"
@@ -1025,10 +1025,9 @@ msgid ""
 msgstr ""
 
 msgid ""
-"After connecting one or more cameras and pressing the ``refresh`` button, a "
-"camera can be chosen from the ``<select source>`` drop down list. Photini "
-"then fetches a list of all the files stored on the camera, which can take "
-"some time."
+"After connecting one or more cameras, one of them can be chosen from the "
+"``<select source>`` drop down list. Photini then fetches a list of all the "
+"files stored on the camera, which can take some time."
 msgstr ""
 
 msgid ""
@@ -1045,6 +1044,11 @@ msgid ""
 "below the image thumbnail area."
 msgstr ""
 
+msgid ""
+"The ``refresh`` button regenerates the file list, which may be useful if you"
+" use another program to add files to the current folder."
+msgstr ""
+
 msgid ""
 "When the ``Target format`` has been set to match where previous images were "
 "put, images that have already been copied to the computer are non selectable"
@@ -5724,3 +5728,13 @@ msgstr ""
 #~ msgid "The word \"holiday\" is immediately marked as copyable."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "After connecting one or more cameras "
+#~ "and pressing the ``refresh`` button, a "
+#~ "camera can be chosen from the "
+#~ "``<select source>`` drop down list. Photini"
+#~ " then fetches a list of all the"
+#~ " files stored on the camera, which "
+#~ "can take some time."
+#~ msgstr ""
+
diff --git 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-10-26 16:35+0100\n"
+"POT-Creation-Date: 2024-11-04 17:25+0000\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: fri, 2023\n"
 "Language: cs@qtfiletype\n"
@@ -1022,10 +1022,9 @@ msgid ""
 msgstr ""
 
 msgid ""
-"After connecting one or more cameras and pressing the ``refresh`` button, a "
-"camera can be chosen from the ``<select source>`` drop down list. Photini "
-"then fetches a list of all the files stored on the camera, which can take "
-"some time."
+"After connecting one or more cameras, one of them can be chosen from the "
+"``<select source>`` drop down list. Photini then fetches a list of all the "
+"files stored on the camera, which can take some time."
 msgstr ""
 
 msgid ""
@@ -1042,6 +1041,11 @@ msgid ""
 "below the image thumbnail area."
 msgstr ""
 
+msgid ""
+"The ``refresh`` button regenerates the file list, which may be useful if you"
+" use another program to add files to the current folder."
+msgstr ""
+
 msgid ""
 "When the ``Target format`` has been set to match where previous images were "
 "put, images that have already been copied to the computer are non selectable"
@@ -5693,3 +5697,13 @@ msgstr ""
 #~ msgid "The word \"holiday\" is immediately marked as copyable."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "After connecting one or more cameras "
+#~ "and pressing the ``refresh`` button, a "
+#~ "camera can be chosen from the "
+#~ "``<select source>`` drop down list. Photini"
+#~ " then fetches a list of all the"
+#~ " files stored on the camera, which "
+#~ "can take some time."
+#~ msgstr ""
+
diff --git 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-10-26 16:35+0100\n"
+"POT-Creation-Date: 2024-11-04 17:25+0000\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: Jim Easterbrook <[email protected]>, 2023\n"
 "Language: de\n"
@@ -1018,10 +1018,9 @@ msgid ""
 msgstr ""
 
 msgid ""
-"After connecting one or more cameras and pressing the ``refresh`` button, a "
-"camera can be chosen from the ``<select source>`` drop down list. Photini "
-"then fetches a list of all the files stored on the camera, which can take "
-"some time."
+"After connecting one or more cameras, one of them can be chosen from the "
+"``<select source>`` drop down list. Photini then fetches a list of all the "
+"files stored on the camera, which can take some time."
 msgstr ""
 
 msgid ""
@@ -1038,6 +1037,11 @@ msgid ""
 "below the image thumbnail area."
 msgstr ""
 
+msgid ""
+"The ``refresh`` button regenerates the file list, which may be useful if you"
+" use another program to add files to the current folder."
+msgstr ""
+
 msgid ""
 "When the ``Target format`` has been set to match where previous images were "
 "put, images that have already been copied to the computer are non selectable"
@@ -5721,3 +5725,13 @@ msgstr ""
 #~ msgid "The word \"holiday\" is immediately marked as copyable."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "After connecting one or more cameras "
+#~ "and pressing the ``refresh`` button, a "
+#~ "camera can be chosen from the "
+#~ "``<select source>`` drop down list. Photini"
+#~ " then fetches a list of all the"
+#~ " files stored on the camera, which "
+#~ "can take some time."
+#~ msgstr ""
+
diff --git 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-10-26 16:35+0100\n"
+"POT-Creation-Date: 2024-11-04 17:25+0000\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: Jim Easterbrook <[email protected]>, 2023\n"
 "Language: es@qtfiletype\n"
@@ -1015,10 +1015,9 @@ msgid ""
 msgstr ""
 
 msgid ""
-"After connecting one or more cameras and pressing the ``refresh`` button, a "
-"camera can be chosen from the ``<select source>`` drop down list. Photini "
-"then fetches a list of all the files stored on the camera, which can take "
-"some time."
+"After connecting one or more cameras, one of them can be chosen from the "
+"``<select source>`` drop down list. Photini then fetches a list of all the "
+"files stored on the camera, which can take some time."
 msgstr ""
 
 msgid ""
@@ -1035,6 +1034,11 @@ msgid ""
 "below the image thumbnail area."
 msgstr ""
 
+msgid ""
+"The ``refresh`` button regenerates the file list, which may be useful if you"
+" use another program to add files to the current folder."
+msgstr ""
+
 msgid ""
 "When the ``Target format`` has been set to match where previous images were "
 "put, images that have already been copied to the computer are non selectable"
@@ -5708,3 +5712,13 @@ msgstr ""
 #~ msgid "The word \"holiday\" is immediately marked as copyable."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "After connecting one or more cameras "
+#~ "and pressing the ``refresh`` button, a "
+#~ "camera can be chosen from the "
+#~ "``<select source>`` drop down list. Photini"
+#~ " then fetches a list of all the"
+#~ " files stored on the camera, which "
+#~ "can take some time."
+#~ msgstr ""
+
diff --git 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-10-26 16:35+0100\n"
+"POT-Creation-Date: 2024-11-04 17:25+0000\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: Jim Easterbrook <[email protected]>, 2023\n"
 "Language: fr@qtfiletype\n"
@@ -1009,10 +1009,9 @@ msgid ""
 msgstr ""
 
 msgid ""
-"After connecting one or more cameras and pressing the ``refresh`` button, a "
-"camera can be chosen from the ``<select source>`` drop down list. Photini "
-"then fetches a list of all the files stored on the camera, which can take "
-"some time."
+"After connecting one or more cameras, one of them can be chosen from the "
+"``<select source>`` drop down list. Photini then fetches a list of all the "
+"files stored on the camera, which can take some time."
 msgstr ""
 
 msgid ""
@@ -1029,6 +1028,11 @@ msgid ""
 "below the image thumbnail area."
 msgstr ""
 
+msgid ""
+"The ``refresh`` button regenerates the file list, which may be useful if you"
+" use another program to add files to the current folder."
+msgstr ""
+
 msgid ""
 "When the ``Target format`` has been set to match where previous images were "
 "put, images that have already been copied to the computer are non selectable"
@@ -5708,3 +5712,13 @@ msgstr ""
 #~ msgid "The word \"holiday\" is immediately marked as copyable."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "After connecting one or more cameras "
+#~ "and pressing the ``refresh`` button, a "
+#~ "camera can be chosen from the "
+#~ "``<select source>`` drop down list. Photini"
+#~ " then fetches a list of all the"
+#~ " files stored on the camera, which "
+#~ "can take some time."
+#~ msgstr ""
+
diff --git 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-10-26 16:35+0100\n"
+"POT-Creation-Date: 2024-11-04 17:25+0000\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: alessio Cadore <[email protected]>, 2023\n"
 "Language: it@qtfiletype\n"
@@ -1009,10 +1009,9 @@ msgid ""
 msgstr ""
 
 msgid ""
-"After connecting one or more cameras and pressing the ``refresh`` button, a "
-"camera can be chosen from the ``<select source>`` drop down list. Photini "
-"then fetches a list of all the files stored on the camera, which can take "
-"some time."
+"After connecting one or more cameras, one of them can be chosen from the "
+"``<select source>`` drop down list. Photini then fetches a list of all the "
+"files stored on the camera, which can take some time."
 msgstr ""
 
 msgid ""
@@ -1029,6 +1028,11 @@ msgid ""
 "below the image thumbnail area."
 msgstr ""
 
+msgid ""
+"The ``refresh`` button regenerates the file list, which may be useful if you"
+" use another program to add files to the current folder."
+msgstr ""
+
 msgid ""
 "When the ``Target format`` has been set to match where previous images were "
 "put, images that have already been copied to the computer are non selectable"
@@ -5707,3 +5711,13 @@ msgstr ""
 #~ msgid "The word \"holiday\" is immediately marked as copyable."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "After connecting one or more cameras "
+#~ "and pressing the ``refresh`` button, a "
+#~ "camera can be chosen from the "
+#~ "``<select source>`` drop down list. Photini"
+#~ " then fetches a list of all the"
+#~ " files stored on the camera, which "
+#~ "can take some time."
+#~ msgstr ""
+
diff --git 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-10-26 16:35+0100\n"
+"POT-Creation-Date: 2024-11-04 17:25+0000\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: Jim Easterbrook <[email protected]>, 2023\n"
 "Language: ko\n"
@@ -1261,11 +1261,11 @@ msgstr ""
 "``IMG_9999.JPG`` 에서 ``100D_IMG_9999.JPG`` 로 변경합니다. 그래서 그들은 ``IMG_9999.JPG`` "
 "와 같은 이름을 사용하는 내 컴팩트 카메라의 파일과 충돌하지 않습니다."
 
+#, fuzzy
 msgid ""
-"After connecting one or more cameras and pressing the ``refresh`` button, a "
-"camera can be chosen from the ``<select source>`` drop down list. Photini "
-"then fetches a list of all the files stored on the camera, which can take "
-"some time."
+"After connecting one or more cameras, one of them can be chosen from the "
+"``<select source>`` drop down list. Photini then fetches a list of all the "
+"files stored on the camera, which can take some time."
 msgstr ""
 "하나 이상의 카메라를 연결하고 ``새로고침`` 버튼을 누르면 ``<select source>`` 드롭다운 목록에서 카메라를 선택할 수 "
 "있습니다. 그런 다음 Photini는 카메라에 저장된 모든 파일 목록을 가져오는데 시간이 걸릴 수 있습니다."
@@ -1287,6 +1287,11 @@ msgid ""
 "below the image thumbnail area."
 msgstr "목록은 파일이 저장될 위치와 함께 중앙 영역에 표시됩니다. 이미지 축소판 영역 아래에 있는 버튼으로 선택한 이름 또는 날짜별로 정렬됩니다."
 
+msgid ""
+"The ``refresh`` button regenerates the file list, which may be useful if you"
+" use another program to add files to the current folder."
+msgstr ""
+
 msgid ""
 "When the ``Target format`` has been set to match where previous images were "
 "put, images that have already been copied to the computer are non selectable"