Merge branch 'master' into fs3

docs/full/tools/manual.rst

@@ -23,11 +23,10 @@ The Manual Module is the main entry point into the Manual Editor Tool.
 
 .. autosummary::
    :nosignatures:
-   
+
    ~tools.manual.manual.Aligner
    ~tools.manual.manual.FrameLoader
    ~tools.manual.manual.Manual
-   ~tools.manual.manual.TkGlobals
 
 .. rubric:: Module
 
@@ -43,7 +42,7 @@ detected_faces module
 
 .. autosummary::
    :nosignatures:
-   
+
    ~tools.manual.detected_faces.DetectedFaces
    ~tools.manual.detected_faces.FaceUpdate
    ~tools.manual.detected_faces.Filter
@@ -55,6 +54,26 @@ detected_faces module
    :undoc-members:
    :show-inheritance:
 
+globals module
+==============
+
+.. rubric:: Module Summary
+
+.. autosummary::
+   :nosignatures:
+
+   ~tools.manual.globals.CurrentFrame
+   ~tools.manual.globals.TkGlobals
+   ~tools.manual.globals.TKVars
+
+.. rubric:: Module
+
+.. automodule:: tools.manual.globals
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+
 thumbnails module
 ==================
 

lib/image.py

@@ -1466,7 +1466,10 @@ def image_from_index(self, index):
             image = self._reader.get_data(index)[..., ::-1]
             filename = self._dummy_video_framename(index)
         else:
-            filename = self.file_list[index]
+            file_list = [f for idx, f in enumerate(self._file_list)
+                         if idx not in self._skip_list] if self._skip_list else self._file_list
+
+            filename = file_list[index]
             image = read_image(filename, raise_error=True)
             filename = os.path.basename(filename)
         logger.trace("index: %s, filename: %s image shape: %s", index, filename, image.shape)

locales/es/LC_MESSAGES/tools.mask.cli.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: faceswap.spanish\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-28 23:51+0000\n"
-"PO-Revision-Date: 2024-03-29 00:01+0000\n"
+"POT-Creation-Date: 2024-06-28 13:45+0100\n"
+"PO-Revision-Date: 2024-06-28 13:47+0100\n"
 "Last-Translator: \n"
 "Language-Team: tokafondo\n"
 "Language: es_ES\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: pygettext.py 1.5\n"
-"X-Generator: Poedit 3.4.2\n"
+"X-Generator: Poedit 3.4.4\n"
 
 #: tools/mask/cli.py:15
 msgid ""
@@ -181,7 +181,7 @@ msgstr ""
 "файл выравниваний. Примечание. «custom» должен быть выбранным «masker», а "
 "маски должны быть в том же формате, что и «input-type» (frames или faces)."
 
-#: tools/mask/cli.py:135 tools/mask/cli.py:154 tools/mask/cli.py:174
+#: tools/mask/cli.py:135 tools/mask/cli.py:154 tools/mask/cli.py:176
 msgid "import"
 msgstr "importar"
 
@@ -216,9 +216,11 @@ msgstr ""
 
 #: tools/mask/cli.py:156
 msgid ""
-"R|Import only. The centering to use when importing masks. Note: For any job "
-"other than 'import' this option is ignored as mask centering is handled "
-"internally.\n"
+"R|Import/Output only. When importing masks, this is the centering to use. "
+"For output this is only used for outputting custom imported masks, and "
+"should correspond to the centering used when importing the mask. Note: For "
+"any job other than 'import' and 'output' this option is ignored as mask "
+"centering is handled internally.\n"
 "L|face: Centers the mask on the center of the face, adjusting for pitch and "
 "yaw. Outside of requirements for full head masking/training, this is likely "
 "to be the best choice.\n"
@@ -230,9 +232,12 @@ msgid ""
 "the nose with and crops closely to the face. Can result in the edges of the "
 "mask appearing outside of the training area."
 msgstr ""
-"R|Sólo importar. El centrado a utilizar al importar máscaras. Nota: Para "
-"cualquier trabajo que no sea \"importar\", esta opción se ignora ya que el "
-"centrado de la máscara se maneja internamente.\n"
+"R|Solo importación/salida. Al importar máscaras, este es el centrado que se "
+"debe utilizar. Para la salida, esto solo se utiliza para generar máscaras "
+"importadas personalizadas y debe corresponder al centrado utilizado al "
+"importar la máscara. Nota: Para cualquier trabajo que no sea \"importación\" "
+"y \"salida\", esta opción se ignora ya que el centrado de la máscara se "
+"maneja internamente.\n"
 "L|cara: centra la máscara en el centro de la cara, ajustando el tono y la "
 "orientación. Aparte de los requisitos para el entrenamiento/enmascaramiento "
 "de cabeza completa, esta probablemente sea la mejor opción.\n"
@@ -244,7 +249,7 @@ msgstr ""
 "nariz y la recorta cerca de la cara. Puede provocar que los bordes de la "
 "máscara aparezcan fuera del área de entrenamiento."
 
-#: tools/mask/cli.py:179
+#: tools/mask/cli.py:181
 msgid ""
 "Import only. The size, in pixels to internally store the mask at.\n"
 "The default is 128 which is fine for nearly all usecases. Larger sizes will "
@@ -256,20 +261,20 @@ msgstr ""
 "uso. Los tamaños más grandes darán como resultado archivos de alineaciones "
 "más grandes y un procesamiento más largo."
 
-#: tools/mask/cli.py:187 tools/mask/cli.py:195 tools/mask/cli.py:209
-#: tools/mask/cli.py:223 tools/mask/cli.py:233
+#: tools/mask/cli.py:189 tools/mask/cli.py:197 tools/mask/cli.py:211
+#: tools/mask/cli.py:225 tools/mask/cli.py:235
 msgid "output"
 msgstr "salida"
 
-#: tools/mask/cli.py:189
+#: tools/mask/cli.py:191
 msgid ""
 "Optional output location. If provided, a preview of the masks created will "
 "be output in the given folder."
 msgstr ""
 "Ubicación de salida opcional. Si se proporciona, se obtendrá una vista "
 "previa de las máscaras creadas en la carpeta indicada."
 
-#: tools/mask/cli.py:200
+#: tools/mask/cli.py:202
 msgid ""
 "Apply gaussian blur to the mask output. Has the effect of smoothing the "
 "edges of the mask giving less of a hard edge. the size is in pixels. This "
@@ -282,7 +287,7 @@ msgstr ""
 "redondeará al siguiente número impar. NB: Sólo afecta a la vista previa de "
 "salida. Si se ajusta a 0, se desactiva"
 
-#: tools/mask/cli.py:214
+#: tools/mask/cli.py:216
 msgid ""
 "Helps reduce 'blotchiness' on some masks by making light shades white and "
 "dark shades black. Higher values will impact more of the mask. NB: Only "
@@ -293,7 +298,7 @@ msgstr ""
 "más a la máscara. NB: Sólo afecta a la vista previa de salida. Si se ajusta "
 "a 0, se desactiva"
 
-#: tools/mask/cli.py:225
+#: tools/mask/cli.py:227
 msgid ""
 "R|How to format the output when processing is set to 'output'.\n"
 "L|combined: The image contains the face/frame, face mask and masked face.\n"
@@ -308,7 +313,7 @@ msgstr ""
 "enmascarada.\n"
 "L|mask: Sólo emite la máscara como una imagen de un solo canal."
 
-#: tools/mask/cli.py:235
+#: tools/mask/cli.py:237
 msgid ""
 "R|Whether to output the whole frame or only the face box when using output "
 "processing. Only has an effect when using frames as input."

locales/kr/LC_MESSAGES/tools.mask.cli.po

@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-28 23:51+0000\n"
-"PO-Revision-Date: 2024-03-29 00:05+0000\n"
+"POT-Creation-Date: 2024-06-28 13:45+0100\n"
+"PO-Revision-Date: 2024-06-28 13:48+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ko_KR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.4.2\n"
+"X-Generator: Poedit 3.4.4\n"
 
 #: tools/mask/cli.py:15
 msgid ""
@@ -165,7 +165,7 @@ msgstr ""
 "'custom'은 선택된 'masker'여야 하며 마스크는 'input-type'(frames 또는 faces)"
 "과 동일한 형식이어야 합니다."
 
-#: tools/mask/cli.py:135 tools/mask/cli.py:154 tools/mask/cli.py:174
+#: tools/mask/cli.py:135 tools/mask/cli.py:154 tools/mask/cli.py:176
 msgid "import"
 msgstr "수입"
 
@@ -196,9 +196,11 @@ msgstr ""
 
 #: tools/mask/cli.py:156
 msgid ""
-"R|Import only. The centering to use when importing masks. Note: For any job "
-"other than 'import' this option is ignored as mask centering is handled "
-"internally.\n"
+"R|Import/Output only. When importing masks, this is the centering to use. "
+"For output this is only used for outputting custom imported masks, and "
+"should correspond to the centering used when importing the mask. Note: For "
+"any job other than 'import' and 'output' this option is ignored as mask "
+"centering is handled internally.\n"
 "L|face: Centers the mask on the center of the face, adjusting for pitch and "
 "yaw. Outside of requirements for full head masking/training, this is likely "
 "to be the best choice.\n"
@@ -210,9 +212,11 @@ msgid ""
 "the nose with and crops closely to the face. Can result in the edges of the "
 "mask appearing outside of the training area."
 msgstr ""
-"R|가져오기만. 마스크를 가져올 때 사용할 센터링입니다. 참고: '가져오기' 이외"
-"의 모든 작업의 경우 마스크 센터링이 내부적으로 처리되므로 이 옵션은 무시됩니"
-"다.\n"
+"R|Import/Output only. 마스크를 가져올 때, 이것은 사용할 중앙 정렬입니다. 출력"
+"의 경우, 이것은 사용자 지정 가져온 마스크를 출력하는 데만 사용되며, 마스크를 "
+"가져올 때 사용된 중앙 정렬과 일치해야 합니다. 참고: 'import' 및 'output' 이외"
+"의 모든 작업의 ​​경우 마스크 중앙 정렬이 내부적으로 처리되므로 이 옵션은 무시됩"
+"니다.\n"
 "L|면: 피치와 요를 조정하여 마스크를 얼굴 중앙에 배치합니다. 머리 전체 마스킹/"
 "훈련에 대한 요구 사항을 제외하면 이것이 최선의 선택일 가능성이 높습니다.\n"
 "L|head: 마스크를 머리 중앙에 배치하여 피치와 요를 조정합니다. 참고: 마스크 내"
@@ -221,7 +225,7 @@ msgstr ""
 "L|레거시: '원래' 추출 기술입니다. 마스크를 코 근처 중앙에 배치하고 얼굴에 가"
 "깝게 자릅니다. 마스크 가장자리가 훈련 영역 외부에 나타날 수 있습니다."
 
-#: tools/mask/cli.py:179
+#: tools/mask/cli.py:181
 msgid ""
 "Import only. The size, in pixels to internally store the mask at.\n"
 "The default is 128 which is fine for nearly all usecases. Larger sizes will "
@@ -231,20 +235,20 @@ msgstr ""
 "기본값은 128이며 거의 모든 사용 사례에 적합합니다. 크기가 클수록 정렬 파일도 "
 "커지고 처리 시간도 길어집니다."
 
-#: tools/mask/cli.py:187 tools/mask/cli.py:195 tools/mask/cli.py:209
-#: tools/mask/cli.py:223 tools/mask/cli.py:233
+#: tools/mask/cli.py:189 tools/mask/cli.py:197 tools/mask/cli.py:211
+#: tools/mask/cli.py:225 tools/mask/cli.py:235
 msgid "output"
 msgstr "출력"
 
-#: tools/mask/cli.py:189
+#: tools/mask/cli.py:191
 msgid ""
 "Optional output location. If provided, a preview of the masks created will "
 "be output in the given folder."
 msgstr ""
 "선택적 출력 위치. 만약 값이 제공된다면 생성된 마스크 미리 보기가 주어진 폴더"
 "에 출력됩니다."
 
-#: tools/mask/cli.py:200
+#: tools/mask/cli.py:202
 msgid ""
 "Apply gaussian blur to the mask output. Has the effect of smoothing the "
 "edges of the mask giving less of a hard edge. the size is in pixels. This "
@@ -256,7 +260,7 @@ msgstr ""
 "은 홀수여야 하며 짝수가 전달되면 다음 홀수로 반올림됩니다. NB: 출력 미리 보기"
 "에만 영향을 줍니다. 0으로 설정하면 꺼집니다"
 
-#: tools/mask/cli.py:214
+#: tools/mask/cli.py:216
 msgid ""
 "Helps reduce 'blotchiness' on some masks by making light shades white and "
 "dark shades black. Higher values will impact more of the mask. NB: Only "
@@ -266,7 +270,7 @@ msgstr ""
 "줄이는 데 도움이 됩니다. 값이 클수록 마스크에 더 많은 영향을 미칩니다. NB: 출"
 "력 미리 보기에만 영향을 줍니다. 0으로 설정하면 꺼집니다"
 
-#: tools/mask/cli.py:225
+#: tools/mask/cli.py:227
 msgid ""
 "R|How to format the output when processing is set to 'output'.\n"
 "L|combined: The image contains the face/frame, face mask and masked face.\n"
@@ -279,7 +283,7 @@ msgstr ""
 "L|masked: 마스크된 얼굴/프레임을 Rgba 이미지로 출력합니다.\n"
 "L|mask: 마스크를 단일 채널 이미지로만 출력합니다."
 
-#: tools/mask/cli.py:235
+#: tools/mask/cli.py:237
 msgid ""
 "R|Whether to output the whole frame or only the face box when using output "
 "processing. Only has an effect when using frames as input."