GIT_SILENT Update Appstream for new release

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 "07")
-set (RELEASE_SERVICE_VERSION_MICRO "70")
+set (RELEASE_SERVICE_VERSION_MINOR "08")
+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

@@ -95,7 +95,7 @@
     <p xml:lang="id">Krfb Desktop Sharing adalah aplikasi server yang memungkinkan kamu untuk berbagi sesimu saat ini dengan pengguna di mesin lain, yang bisa menggunakan klien VNC untuk menampilkan atau bahkan mengendalikan desktop.</p>
     <p xml:lang="it">Condivisione del desktop Krfb è un'applicazione server che permette di condividere la sessione attuale con un utente su un'altra macchina, che potrà usare un client VNC per visualizzare ed anche controllare il desktop.</p>
     <p xml:lang="ka">Krfb სამუშაო მაგიდის გაზიარება აპლიკაციის სერვერია, რომელიც თქვენი მიმდინარე სესიის სხვა მომხმარებლისთვის, რომელსაც VNC კლიენტი აქვს, გაზიარების და კონტროლის გადაცემის საშუალებას გაძლევთ.</p>
-    <p xml:lang="ko">Krfb 데스크톱 공유는 현재 세션을 다른 머신의 사용자와 VNC를 통해서 공유하거나 원격 제어를 요청할 수 있는 서버 프로그램입니다.</p>
+    <p xml:lang="ko">Krfb 데스크톱 공유는 현재 세션을 다른 머신의 사용자와 VNC를 통해서 공유하거나 원격 제어를 요청할 수 있는 서버 앱입니다.</p>
     <p xml:lang="nl">Bureaublad delen is een server-applicatie die u in staat stelt uw huidige sessie te delen met een gebruiker op een andere machine, die een VNC-client kan gebruiken om uw bureaublad te bekijken of zelfs te besturen.</p>
     <p xml:lang="nn">Krfb skrivebordsdeling er eit tenar­program som lèt deg dela skrivebords­økta di med ein brukar på ei anna maskin. Vedkommande kan så bruka ein VNC-klient for å sjå og eventuelt òg styra økta.</p>
     <p xml:lang="pl">Współdzielenie pulpitu Krfb jest aplikacją serwerową, która umożliwia współdzielenie twojej bieżącej sesji z użytkownikiem na innym komputerze, który może użyć klienta VNC do oglądania,a a nawet sterowania twoim pulpitem.</p>
@@ -165,9 +165,9 @@
   </provides>
   <project_group>KDE</project_group>
   <releases>
-    <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"/>
+    <release version="23.08.3" date="2023-11-09"/>
+    <release version="23.08.2" date="2023-10-12"/>
+    <release version="23.08.1" date="2023-09-14"/>
+    <release version="23.08.0" date="2023-08-24"/>
   </releases>
 </component>

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

@@ -21,6 +21,7 @@ Name[it]=Monitor virtuale di KRFB
 Name[ka]=KRFB-ის ვირტუალური ეკრანი
 Name[ko]=KRFBs 가상 모니터
 Name[nl]=Virtuele monitor van KRFB
+Name[nn]=KRFBs virtuell skjerm
 Name[pl]=Monitor wirtualny KRFB
 Name[pt]=Monitor Virtual do KRFB
 Name[pt_BR]=Monitor virtual do KRFB
@@ -50,6 +51,7 @@ Comment[it]=Monitor virtuale remoto
 Comment[ka]=დაშორებული ვირტუალური ეკრანი
 Comment[ko]=원격 가상 모니터
 Comment[nl]=Virtual Monitor op afstand
+Comment[nn]=Virtuell skjerm for ekstern ressurs
 Comment[pl]=Zdalny monitor wirtualny
 Comment[pt]=Monitor Virtual Remoto
 Comment[pt_BR]=Monitor virtual remoto

po/gl/krfb.po

@@ -339,8 +339,9 @@ msgid ""
 "Failed to start the krfb server. Desktop sharing will not work. Try setting "
 "another port in the settings and restart krfb."
 msgstr ""
-"Non se puido iniciar o servidor krfb. Non se poderá compartir o escritorio. "
-"Probe a escoller un porto distinto na configuración e reinicie krfb."
+"Non foi posíbel iniciar o servidor krfb. Non se poderá compartir o "
+"escritorio. Probe a escoller un porto distinto na configuración e reinicie "
+"krfb."
 
 #. i18n: ectx: property (whatsThis), widget (QLabel, titleLabel)
 #. i18n: ectx: property (text), widget (QLabel, titleLabel)

po/ko/krfb.po

@@ -404,7 +404,7 @@ msgstr "화면 캡처"
 #: mainwindow.cpp:256
 #, kde-format
 msgid "To apply framebuffer plugin setting, you need to restart the program."
-msgstr "프레임버퍼 플러그인 설정을 적용하려면 프로그램을 다시 시작해야 합니다."
+msgstr "프레임버퍼 플러그인 설정을 적용하려면 앱을 다시 시작해야 합니다."
 
 #: rfbservermanager.cpp:229
 #, kde-format

po/nn/krfb.po

@@ -1,20 +1,20 @@
 # Translation of krfb to Norwegian Nynorsk
 #
 # Gaute Hvoslef Kvalnes <gaute@verdsveven.com>, 2003, 2004.
-# Karl Ove Hufthammer <karl@huftis.org>, 2007, 2008, 2009, 2018, 2020.
+# Karl Ove Hufthammer <karl@huftis.org>, 2007, 2008, 2009, 2018, 2020, 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: 2020-11-02 20:58+0100\n"
+"PO-Revision-Date: 2023-07-31 21:03+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <l10n-no@lister.huftis.org>\n"
 "Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 20.08.2\n"
+"X-Generator: Lokalize 23.04.3\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Environment: kde\n"
 "X-Accelerator-Marker: &\n"
@@ -119,17 +119,17 @@ msgstr "Føretrekt programtillegg for biletbuffer"
 #: main-virtualmonitor.cpp:49
 #, kde-format
 msgid "Creating a Virtual Monitor from %1"
-msgstr ""
+msgstr "Lagar virtuell avlyttar frå %1"
 
 #: main-virtualmonitor.cpp:80
 #, kde-format
 msgid "Remote Virtual Monitor"
-msgstr ""
+msgstr "Virtuell skjerm for ekstern ressurs"
 
 #: main-virtualmonitor.cpp:82
 #, kde-format
 msgid "Offer a Virtual Monitor that can be accessed remotely"
-msgstr ""
+msgstr "Tilbyr ein virtuell skjerm ein kan få tilgang til eksternt"
 
 #: main-virtualmonitor.cpp:84 main.cpp:98
 #, kde-format
@@ -153,7 +153,7 @@ msgstr ""
 #: main-virtualmonitor.cpp:91
 #, kde-format
 msgid "Virtual Monitor implementation"
-msgstr ""
+msgstr "Implementasjon av virtuell skjerm"
 
 #: main-virtualmonitor.cpp:92 main.cpp:108
 #, kde-format
@@ -223,52 +223,52 @@ msgstr "Opphavlege VNC-kodarar og protokollutforming"
 #: main-virtualmonitor.cpp:108
 #, kde-format
 msgid "Logical resolution of the new monitor"
-msgstr ""
+msgstr "Logisk oppløysing på ny skjerm"
 
 #: main-virtualmonitor.cpp:108
 #, kde-format
 msgid "resolution"
-msgstr ""
+msgstr "oppløysing"
 
 #: main-virtualmonitor.cpp:110
 #, kde-format
 msgid "Name of the monitor"
-msgstr ""
+msgstr "Namnet på skjermen"
 
 #: main-virtualmonitor.cpp:110
 #, kde-format
 msgid "name"
-msgstr ""
+msgstr "namn"
 
 #: main-virtualmonitor.cpp:112
 #, kde-format
 msgid "Password for the client to connect to it"
-msgstr ""
+msgstr "Passord for tilkopling frå klienten"
 
 #: main-virtualmonitor.cpp:112
 #, kde-format
 msgid "password"
-msgstr ""
+msgstr "passord"
 
 #: main-virtualmonitor.cpp:114
 #, kde-format
 msgid "The device-pixel-ratio of the device, the scaling factor"
-msgstr ""
+msgstr "Einingspiksel-forholdet til eininga – skaleringsfaktor"
 
 #: 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 "Porten me skal lytta til"
 
 #: main-virtualmonitor.cpp:116
 #, kde-format
 msgid "number"
-msgstr ""
+msgstr "tal"
 
 #: main.cpp:49
 #, kde-format

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-07-03 11:38\n"
+"PO-Revision-Date: 2023-10-21 13:57\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
@@ -14,8 +14,8 @@ msgstr ""
 "X-Crowdin-Project: kdeorg\n"
 "X-Crowdin-Project-ID: 269464\n"
 "X-Crowdin-Language: zh-CN\n"
-"X-Crowdin-File: /kf5-trunk/messages/krfb/krfb.pot\n"
-"X-Crowdin-File-ID: 5437\n"
+"X-Crowdin-File: /kf5-stable/messages/krfb/krfb.pot\n"
+"X-Crowdin-File-ID: 3448\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"

snapcraft.yaml

@@ -0,0 +1,162 @@
+# Trigger rebuild
+---
+name: krfb
+confinement: strict
+grade: stable
+base: core22
+adopt-info: krfb
+apps:
+    krfb:
+        # extensions:
+        # - kde-neon
+        common-id: org.kde.krfb
+        desktop: usr/share/applications/org.kde.krfb.desktop
+        command: usr/bin/krfb
+        plugs:
+        - home
+        - desktop
+        - desktop-legacy
+        - opengl
+        - wayland
+        - x11
+        - audio-playback
+        - unity7
+        - network
+        - network-bind
+        command-chain:
+        - snap/command-chain/desktop-launch
+assumes:
+- snapd2.58.3
+compression: lzo
+plugs:
+    desktop:
+        mount-host-font-cache: false
+    icon-themes:
+        interface: content
+        target: $SNAP/data-dir/icons
+        default-provider: gtk-common-themes
+    sound-themes:
+        interface: content
+        target: $SNAP/data-dir/sounds
+        default-provider: gtk-common-themes
+    kf5-5-110-qt-5-15-11-core22:
+        content: kf5-5-110-qt-5-15-11-core22-all
+        interface: content
+        default-provider: kf5-5-110-qt-5-15-11-core22
+        target: $SNAP/kf5
+environment:
+    SNAP_DESKTOP_RUNTIME: $SNAP/kf5
+hooks:
+    configure:
+        plugs:
+        - desktop
+        command-chain:
+        - snap/command-chain/hooks-configure-desktop
+layout:
+    /usr/share/X11:
+        symlink: $SNAP/kf5/usr/share/X11
+slots:
+    session-dbus-interface:
+        interface: dbus
+        name: org.kde.krfb
+        bus: session
+package-repositories:
+-   type: apt
+    components:
+    - main
+    suites:
+    - jammy
+    key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D
+    url: http://origin.archive.neon.kde.org/user
+    key-server: keyserver.ubuntu.com
+parts:
+    kde-neon:
+        source: /snap/snapcraft/current/share/snapcraft/extensions/desktop/kde-neon
+        source-type: local
+        plugin: make
+        make-parameters:
+        - PLATFORM_PLUG=kf5-5-110-qt-5-15-11-core22
+        build-snaps:
+        - kf5-5-110-qt-5-15-11-core22-sdk
+        build-environment:
+        - &id001
+            PATH: /snap/kf5-5-110-qt-5-15-11-core22-sdk/current/usr/bin${PATH:+:$PATH}
+        - &id002
+            XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/snap/kf5-5-110-qt-5-15-11-core22-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}
+        - &id003
+            XDG_CONFIG_HOME: $CRAFT_STAGE/etc/xdg:/snap/kf5-5-110-qt-5-15-11-core22-sdk/current/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME}
+        - &id004
+            CRAFT_CMAKE_ARGS: -DCMAKE_FIND_ROOT_PATH=/snap/kf5-5-110-qt-5-15-11-core22-sdk/current${CRAFT_CMAKE_ARGS:+:$CRAFT_CMAKE_ARGS}
+    krfb:
+        parse-info:
+        - usr/share/metainfo/org.kde.krfb.appdata.xml
+        plugin: cmake
+        build-packages:
+        - libkf5doctools-dev
+        - libxcb-render0-dev
+        - libxcb-shape0-dev
+        - libxcb-xfixes0-dev
+        - libxcb-shm0-dev
+        - libxcb-damage0-dev
+        - libxcb-image0-dev
+        - libkpipewire-dev
+        - libvncserver-dev
+        - libpipewire-0.3-dev
+        - libepoxy-dev
+        - libgbm-dev
+        - plasma-wayland-protocols
+        - libwayland-dev
+        - libxdamage-dev
+        - libxtst-dev
+        stage-packages:
+        - libxcb-render0
+        - libxcb-shape0
+        - libxcb-xfixes0
+        - libxcb-shm0-dev
+        - libxcb-damage0-dev
+        - libxcb-image0-dev
+        - libkpipewire5
+        - libvncserver1
+        - pipewire-bin
+        - pipewire-audio-client-libraries
+        - libepoxy0
+        - libgbm1
+        - plasma-wayland-protocols
+        - libwayland-client0
+        - libxdamage1
+        - libxtst6
+        source: .
+        source-type: local
+        cmake-parameters:
+        - "-DCMAKE_INSTALL_PREFIX=/usr"
+        - "-DCMAKE_BUILD_TYPE=Release"
+        - "-DENABLE_TESTING=OFF"
+        - "-DBUILD_TESTING=OFF"
+        - "-DKDE_SKIP_TEST_SETTINGS=ON"
+        - "-DCMAKE_FIND_ROOT_PATH=/usr\\;$CRAFT_STAGE\\;/snap/kf5-5-110-qt-5-15-11-core22-sdk/current"
+        - "-DKDE_INSTALL_PLUGINDIR=/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/plugins/"
+        prime:
+        - "-usr/lib/*/cmake/*"
+        - "-usr/include/*"
+        - "-usr/share/ECM/*"
+        - "-usr/share/doc/*"
+        - "-usr/share/man/*"
+        - "-usr/share/icons/breeze-dark*"
+        - "-usr/bin/X11"
+        - "-usr/lib/gcc/$CRAFT_ARCH_TRIPLET/6.0.0"
+        - "-usr/lib/aspell/*"
+        - "-usr/share/lintian"
+        build-environment: &id005
+        - *id001
+        - *id002
+        - *id003
+        - *id004
+    cleanup:
+        after:
+        - kde-neon
+        - krfb
+        plugin: nil
+        override-prime:  |
+            set -eux
+            # # Unused libraries found by linter
+