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"

CMakeLists.txt

@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.16)
 
 # KDE Application Version, managed by release script
 set (RELEASE_SERVICE_VERSION_MAJOR "23")
-set (RELEASE_SERVICE_VERSION_MINOR "03")
-set (RELEASE_SERVICE_VERSION_MICRO "80")
+set (RELEASE_SERVICE_VERSION_MINOR "04")
+set (RELEASE_SERVICE_VERSION_MICRO "3")
 set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(krfb VERSION ${RELEASE_SERVICE_VERSION})

krfb/org.kde.krfb.appdata.xml

@@ -54,6 +54,7 @@
   <summary xml:lang="eu">Partekatu zure mahaigaina beste ordenagailu batekin VNC erabiliz</summary>
   <summary xml:lang="fi">Jaa työpöytä toiselle koneelle VNC:n kautta</summary>
   <summary xml:lang="fr">Partager votre bureau avec un autre ordinateur grâce à « VNC »</summary>
+  <summary xml:lang="gl">Comparte o teu escritorio con outro computador por VNC</summary>
   <summary xml:lang="ia">Compartir tu scriptorio a un altere computator via VNC</summary>
   <summary xml:lang="id">Bagikan desktopmu ke komputer lainnya via VNC</summary>
   <summary xml:lang="it">Condividi il desktop con un altro computer tramite VNC</summary>
@@ -160,9 +161,9 @@
   </provides>
   <project_group>KDE</project_group>
   <releases>
-    <release version="22.12.3" date="2023-03-02"/>
-    <release version="22.12.2" date="2023-02-02"/>
-    <release version="22.12.1" date="2023-01-05"/>
-    <release version="22.12.0" date="2022-12-08"/>
+    <release version="23.04.3" date="2023-07-06"/>
+    <release version="23.04.2" date="2023-06-08"/>
+    <release version="23.04.1" date="2023-05-11"/>
+    <release version="23.04.0" date="2023-04-20"/>
   </releases>
 </component>

krfb/org.kde.krfb.desktop

@@ -88,6 +88,7 @@ GenericName[et]=Töölaua jagamine (VNC)
 GenericName[eu]=Mahaigaina partekatzea (VNC)
 GenericName[fi]=Työpöydän jakaminen (VNC)
 GenericName[fr]=Partage de bureaux (VNC)
+GenericName[gl]=Compartir o escritorio (VNC)
 GenericName[ia]=Compartir de scriptorio (VNC)
 GenericName[it]=Condivisione del desktop (VNC)
 GenericName[ka]=სამუშაო მაგიდის გაზიარება(VNC).

krfb/org.kde.krfb.virtualmonitor.desktop.cmake

@@ -14,6 +14,7 @@ Name[es]=Monitor virtual de KRFB
 Name[eu]=KRFBren alegiazko monitorea
 Name[fi]=KRFB:n virtuaalinäyttö
 Name[fr]=Moniteur virtuel « Krfb »
+Name[gl]=Monitor virtual de KRFB
 Name[ia]=Virtual Monitor de KRFB
 Name[it]=Monitor virtuale di KRFB
 Name[ka]=KRFB-ის ვირტუალური ეკრანი
@@ -41,6 +42,7 @@ Comment[es]=Monitor virtual remoto
 Comment[eu]=Urruneko alegiazko monitorea
 Comment[fi]=Virtuaalinen etänäyttö
 Comment[fr]=Moniteur virtuel distant
+Comment[gl]=Monitor virtual remoto
 Comment[ia]=Monitor Virtual Remote
 Comment[it]=Monitor virtuale remoto
 Comment[ka]=დაშორებული ვირტუალური ეკრანი

po/de/krfb.po

@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 21.12.3\n"
 
 #, kde-format

po/fa/krfb.po

@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"

po/fr/krfb.po

@@ -15,10 +15,10 @@
 # xavier <xavier.besnard@neuf.fr>, 2013, 2021.
 # Vincent Pinon <vpinon@kde.org>, 2017.
 # Simon Depiets <sdepiets@gmail.com>, 2019.
+# Xavier BESNARD <xavier.besnard@neuf.fr>, 2023.
 #
 # invite, 2008.
 # amine say, 2011.
-# Xavier BESNARD <xavier.besnard]neuf.fr>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: krfb\n"

po/gl/krfb.po

@@ -8,20 +8,21 @@
 # Xosé <xosecalvo@gmail.com>, 2009.
 # Marce Villarino <mvillarino@kde-espana.es>, 2012, 2013, 2014.
 # Adrian Chaves Fernandez <adriyetichaves@gmail.com>, 2012, 2015, 2017.
-# Adrián Chaves (Gallaecio) <adrian@chaves.io>, 2017, 2018, 2019.
+# Adrián Chaves (Gallaecio) <adrian@chaves.io>, 2017, 2018, 2019, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: krfb\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2022-07-18 00:45+0000\n"
-"PO-Revision-Date: 2019-07-13 12:48+0200\n"
+"PO-Revision-Date: 2023-04-30 15:46+0200\n"
 "Last-Translator: Adrián Chaves (Gallaecio) <adrian@chaves.io>\n"
-"Language-Team: Galician <kde-i18n-doc@kde.org>\n"
+"Language-Team: Galician <proxecto@trasno.gal>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 23.04.0\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -73,7 +74,7 @@ msgstr "Iniciar minimizado."
 #: krfb.kcfg:15
 #, kde-format
 msgid "Use the default port for VNC (5900)"
-msgstr "Empregar o porto predeterminado para VNC (5900)"
+msgstr "Usar o porto predeterminado para VNC (5900)"
 
 #. i18n: ectx: label, entry (port), group (TCP)
 #: krfb.kcfg:19
@@ -122,17 +123,17 @@ msgstr "Complemento de búfer de fotograma preferido"
 #: main-virtualmonitor.cpp:49
 #, kde-format
 msgid "Creating a Virtual Monitor from %1"
-msgstr ""
+msgstr "Creando un monitor virtual desde %1"
 
 #: main-virtualmonitor.cpp:80
 #, kde-format
 msgid "Remote Virtual Monitor"
-msgstr ""
+msgstr "Monitor virtual remoto"
 
 #: main-virtualmonitor.cpp:82
 #, kde-format
 msgid "Offer a Virtual Monitor that can be accessed remotely"
-msgstr ""
+msgstr "Ofrecer un monitor virtual ao que se pode acceder en remoto"
 
 #: main-virtualmonitor.cpp:84 main.cpp:98
 #, kde-format
@@ -156,7 +157,7 @@ msgstr ""
 #: main-virtualmonitor.cpp:91
 #, kde-format
 msgid "Virtual Monitor implementation"
-msgstr ""
+msgstr "Implementación do monitor virtual"
 
 #: main-virtualmonitor.cpp:92 main.cpp:108
 #, kde-format
@@ -226,54 +227,52 @@ msgstr "codificadores orixinais de VNC e deseño do protocolo"
 #: main-virtualmonitor.cpp:108
 #, kde-format
 msgid "Logical resolution of the new monitor"
-msgstr ""
+msgstr "Resolución lóxica do novo monitor"
 
 #: main-virtualmonitor.cpp:108
 #, kde-format
 msgid "resolution"
-msgstr ""
+msgstr "resolución"
 
 #: main-virtualmonitor.cpp:110
 #, kde-format
 msgid "Name of the monitor"
-msgstr ""
+msgstr "Nome do monitor"
 
 #: main-virtualmonitor.cpp:110
 #, kde-format
 msgid "name"
-msgstr ""
+msgstr "nome"
 
 #: main-virtualmonitor.cpp:112
-#, fuzzy, kde-format
-#| msgid "Password for uninvited connections."
+#, kde-format
 msgid "Password for the client to connect to it"
-msgstr "Contrasinal das conexións sen convite."
+msgstr "Contrasinal para que o cliente se conecte a el"
 
 #: main-virtualmonitor.cpp:112
-#, fuzzy, kde-format
-#| msgid "&Password"
+#, kde-format
 msgid "password"
-msgstr "&Contrasinal:"
+msgstr "contrasinal"
 
 #: main-virtualmonitor.cpp:114
 #, kde-format
 msgid "The device-pixel-ratio of the device, the scaling factor"
-msgstr ""
+msgstr "A taxa de píxel de dispositivo do dispositivo, o factor de escala"
 
 #: main-virtualmonitor.cpp:114
 #, kde-format
 msgid "dpr"
-msgstr ""
+msgstr "dpr"
 
 #: main-virtualmonitor.cpp:116
 #, kde-format
 msgid "The port we will be listening to"
-msgstr ""
+msgstr "O porto de entrada"
 
 #: main-virtualmonitor.cpp:116
 #, kde-format
 msgid "number"
-msgstr ""
+msgstr "número"
 
 #: main.cpp:49
 #, kde-format
@@ -312,7 +311,7 @@ msgstr "Compatibilidade cos tubos de Telepathy."
 #: main.cpp:126
 #, kde-format
 msgid "Do not show the invitations management dialog at startup"
-msgstr "Non mostrar o diálogo de xestión dos convites ao comezo"
+msgstr "Non amosar o diálogo de xestión dos convites ao comezo"
 
 #: main.cpp:148
 #, kde-format
@@ -404,7 +403,7 @@ msgstr "Rede"
 #: mainwindow.cpp:250
 #, kde-format
 msgid "Security"
-msgstr "Seguranza"
+msgstr "Seguridade"
 
 #: mainwindow.cpp:251
 #, kde-format
@@ -477,7 +476,7 @@ msgstr ""
 "<html><head/><body> <p>Ao usar x11 debería preferirse o complemento <span "
 "style=\" font-weight:600;\">xcb</span>, porque ten un mellor rendemento.<br/"
 "> O complemento <span style=\" font-weight:600;\">qt</span> é unha "
-"alternativa de seguranza, se por algún motivo non funcionan outros "
+"alternativa de seguridade, se por algún motivo non funcionan outros "
 "complementos. Pero é moi lento.</p> </body></html>"
 
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_allowDesktopControl)
@@ -496,7 +495,7 @@ msgstr "Non almacenar os contrasinais usando a carteira de KDE"
 #: ui/configtcp.ui:26
 #, kde-format
 msgid "Use default port"
-msgstr "Empregar o porto predeterminado"
+msgstr "Usar o porto predeterminado"
 
 #. i18n: ectx: property (text), widget (QLabel, label)
 #: ui/configtcp.ui:50
@@ -542,7 +541,7 @@ msgid ""
 "screen."
 msgstr ""
 "Se sinala esta opción, o usuario remoto pode inserir polo teclado e usar o "
-"rato. Isto dalle control completo sobre o computador, así que teña coidado. "
+"rato. Isto dálle control completo sobre o computador, así que teña coidado. "
 "Cando a opción está desactivada, o usuario remoto só poderá ver a pantalla."
 
 #. i18n: ectx: property (text), widget (QCheckBox, cbAllowRemoteControl)
@@ -643,6 +642,7 @@ msgstr ""
 "Contrasinal que os usuario remotos necesitan para conectar ao seu "
 "escritorio. Prema o botón «Editar» da dereita para cambiar o contrasinal."
 
+# well-spelled: ContrasinalTemporal
 #. i18n: ectx: property (text), widget (QLabel, passwordDisplayLabel)
 #: ui/mainwidget.ui:314
 #, kde-format

po/ja/krfb.po

@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 19.08.1\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
 

po/tr/krfb.po

@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: kdenetwork-kde4\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2022-07-18 00:45+0000\n"
-"PO-Revision-Date: 2023-01-21 15:31+0300\n"
+"PO-Revision-Date: 2023-05-24 01:01+0300\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: Turkish <kde-l10n-tr@kde.org>\n"
 "Language: tr\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 22.12.1\n"
+"X-Generator: Lokalize 23.07.70\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -90,7 +90,7 @@ msgstr "Bu, krfb uygulamasının dinleyeceği kapı numarasıdır."
 #: krfb.kcfg:23 ui/configtcp.ui:16
 #, kde-format
 msgid "Announce the service on the local network"
-msgstr "Servisi yerel ağa duyur"
+msgstr "Hizmeti yerel ağa duyur"
 
 #. i18n: ectx: label, entry (noWallet), group (Security)
 #: krfb.kcfg:29

po/zh_CN/krfb.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2022-07-18 00:45+0000\n"
-"PO-Revision-Date: 2023-03-11 04:55\n"
+"PO-Revision-Date: 2023-07-03 11:41\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"