GIT_SILENT Sync po/docbooks with svn

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

po/ca/kdenlive.po

@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: kdenlive\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2023-07-05 03:38+0000\n"
-"PO-Revision-Date: 2023-06-18 10:31+0200\n"
+"PO-Revision-Date: 2023-07-07 09:01+0200\n"
 "Last-Translator: Josep M. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca\n"
@@ -925,7 +925,7 @@ msgstr "Durada"
 #: src/timeline2/view/qml/Track.qml:355
 #, kde-format
 msgid "In"
-msgstr "Dins"
+msgstr "Entrada"
 
 #: data/effects/fade_from_black.xml:14
 #, kde-format
@@ -16313,7 +16313,7 @@ msgstr "No hi ha cap clip a retallar"
 #: src/timeline2/view/timelinecontroller.cpp:2141
 #, kde-format
 msgid "In:%1, Out:%2 (%3%4)"
-msgstr "Cap endins:%1, Cap enfora:%2 (%3%4)"
+msgstr "Entrada:%1, sortida:%2 (%3%4)"
 
 #: src/timeline2/view/timelinecontroller.cpp:2689
 #, kde-format
@@ -21252,6 +21252,3 @@ msgstr "%1m"
 msgctxt "h as hours"
 msgid "%1h"
 msgstr "%1h"
-
-#~ msgid "Open %1"
-#~ msgstr "Obre %1"

po/ca@valencia/kdenlive.po

@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: kdenlive\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2023-07-05 03:38+0000\n"
-"PO-Revision-Date: 2023-06-18 10:31+0200\n"
+"PO-Revision-Date: 2023-07-07 09:01+0200\n"
 "Last-Translator: Josep M. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca@valencia\n"
@@ -926,7 +926,7 @@ msgstr "Duració"
 #: src/timeline2/view/qml/Track.qml:355
 #, kde-format
 msgid "In"
-msgstr "Dins"
+msgstr "Entrada"
 
 #: data/effects/fade_from_black.xml:14
 #, kde-format
@@ -3317,7 +3317,7 @@ msgstr "Guarda la pila d'efectes…"
 msgctxt "@info:whatsthis"
 msgid "Saves the entire effect stack as an XML file for use in other projects."
 msgstr ""
-"Guarda tota la pila d'efectes com un fitxer XML per a utilitzar-lo en altres "
+"Guarda tota la pila d'efectes com un fitxer XML per a utilitzar-la en altres "
 "projectes."
 
 #: src/assets/assetpanel.cpp:96
@@ -16316,7 +16316,7 @@ msgstr "No hi ha cap clip que s'haja de retallar"
 #: src/timeline2/view/timelinecontroller.cpp:2141
 #, kde-format
 msgid "In:%1, Out:%2 (%3%4)"
-msgstr "Cap endins:%1, Cap enfora:%2 (%3%4)"
+msgstr "Entrada:%1, eixida:%2 (%3%4)"
 
 #: src/timeline2/view/timelinecontroller.cpp:2689
 #, kde-format

po/it/kdenlive.po

@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: kdenlive\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2023-07-05 03:38+0000\n"
-"PO-Revision-Date: 2023-06-24 21:06+0200\n"
+"PO-Revision-Date: 2023-07-02 17:26+0200\n"
 "Last-Translator: Paolo Zamponi <feus73@gmail.com>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
 "Language: it\n"
@@ -2744,7 +2744,7 @@ msgstr "Nel principale"
 #: data/kdenliveeffectscategory.rc:34
 #, kde-format
 msgid "Color and Image correction"
-msgstr "Colore e correzione dell'immagine"
+msgstr "Correzione del colore e dell'immagine"
 
 #: data/kdenliveeffectscategory.rc:38
 #, kde-format
@@ -16587,7 +16587,7 @@ msgstr "Blocca traccia sottotitoli"
 #: src/timeline2/view/timelinetabs.cpp:46
 #, kde-format
 msgid "Add Timeline Sequence"
-msgstr "Aggiungi sequenza di linea temporale"
+msgstr "Aggiungi sequenza nella linea temporale"
 
 #: src/timeline2/view/timelinetabs.cpp:48
 #, kde-format
@@ -16595,7 +16595,7 @@ msgid ""
 "Add Timeline Sequence. This will create a new timeline for editing. Each "
 "timeline corresponds to a Sequence Clip in the Project Bin"
 msgstr ""
-"Aggiungi sequenza di linea temporale. Questo creerà una nuova linea "
+"Aggiungi sequenza nella linea temporale. Quest'azione creerà una nuova linea "
 "temporale per la modifica. Ciascuna linea temporale corrisponde a una clip "
 "di sequenze nel contenitore del progetto"
 

po/nb/kdenlive.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2023-06-18 04:12+0000\n"
+"POT-Creation-Date: 2023-07-05 03:38+0000\n"
 "PO-Revision-Date: 2012-01-01 20:29+0100\n"
 "Last-Translator: Kjetil Kilhavn <kjetil@kilhavn.no>\n"
 "Language-Team: Norwegian Bokmål <l10n-no@lister.huftis.org>\n"
@@ -5097,12 +5097,12 @@ msgstr ""
 msgid "File already exists"
 msgstr ""
 
-#: src/bin/projectclip.cpp:2684
+#: src/bin/projectclip.cpp:2686
 #, kde-format
 msgid "Add stream effect"
 msgstr ""
 
-#: src/bin/projectclip.cpp:2709
+#: src/bin/projectclip.cpp:2711
 #, kde-format
 msgid "Remove stream effect"
 msgstr ""
@@ -13118,17 +13118,17 @@ msgid ""
 "%1"
 msgstr ""
 
-#: src/project/projectmanager.cpp:1697
+#: src/project/projectmanager.cpp:1698
 #, kde-format
 msgid "Importing a sequence clip, this is currently in experimental state"
 msgstr ""
 
-#: src/project/projectmanager.cpp:1868
+#: src/project/projectmanager.cpp:1869
 #, kde-format
 msgid "Select a clip to create sequence"
 msgstr ""
 
-#: src/project/projectmanager.cpp:1905
+#: src/project/projectmanager.cpp:1906
 #, kde-format
 msgid "Create Sequence Clip"
 msgstr ""

po/nl/kdenlive.po

@@ -10,14 +10,14 @@ msgstr ""
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2023-07-05 03:38+0000\n"
-"PO-Revision-Date: 2023-06-22 10:08+0200\n"
+"PO-Revision-Date: 2023-07-12 10:55+0200\n"
 "Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
 "Language-Team: \n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 23.04.2\n"
+"X-Generator: Lokalize 23.04.3\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #, kde-format
@@ -2526,7 +2526,7 @@ msgstr "Referentieframe"
 #: data/effects/vignette.xml:4
 #, kde-format
 msgid "Vignette Effect"
-msgstr "Vignetteringseffect"
+msgstr "Effect vignet"
 
 #: data/effects/vignette.xml:5
 #, kde-format

po/tr/kdenlive.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2023-07-05 03:38+0000\n"
-"PO-Revision-Date: 2023-06-26 22:31+0300\n"
+"PO-Revision-Date: 2023-07-12 11:45+0300\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: Turkish <kde-l10n-tr@kde.org>\n"
 "Language: tr\n"
@@ -15842,7 +15842,7 @@ msgstr "Mikrofon düzeyi"
 #: src/timeline2/view/qml/Clip.qml:223 src/timeline2/view/qml/Clip.qml:840
 #, kde-format
 msgid "%1 (%2-%3), Position: %4, Duration: %5"
-msgstr "%1 (%2-%3), Pozisyon: %4, Süre: %5"
+msgstr "%1 (%2-%3), Konum: %4, Süre: %5"
 
 #: src/timeline2/view/qml/Clip.qml:333 src/timeline2/view/qml/Clip.qml:340
 #: src/timeline2/view/qml/SubTitle.qml:164

thumbnailer/mltpreview.json

@@ -20,6 +20,7 @@
         "Name[gl]": "Lista de reprodución de MLT",
         "Name[id]": "Playlist MLT",
         "Name[it]": "Lista di riproduzione MLT",
+        "Name[ja]": "MLT プレイリスト",
         "Name[nl]": "MLT-afspeellijst",
         "Name[pl]": "Lista odtwarzania MLT",
         "Name[pt_BR]": "Lista de reprodução MLT",