SVN_SILENT made messages (.desktop file) - always resolve ours

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"
GIT_SILENT Upgrade release service version to 21.11.90.
2026-07-01 15:51:18 -07:00 · 2021-11-25 02:31:15 +00:00 · 2021-11-22 23:39:55 +01:00 · 2021-11-16 22:25:56 +01:00 · 2021-11-14 02:27:52 +00:00 · 2021-11-12 02:30:26 +00:00
3 changed files with 10 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16)
 # KDE Application Version, managed by release script
 set (RELEASE_SERVICE_VERSION_MAJOR "21")
 set (RELEASE_SERVICE_VERSION_MINOR "11")
-set (RELEASE_SERVICE_VERSION_MICRO "80")
+set (RELEASE_SERVICE_VERSION_MICRO "90")
 set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")

 project(krfb VERSION ${RELEASE_SERVICE_VERSION})
--- a/krfb/CMakeLists.txt
+++ b/krfb/CMakeLists.txt
@@ -78,7 +78,7 @@ kconfig_add_kcfg_files (krfb_SRCS
                     krfbconfig.kcfgc
 )

-ki18n_wrap_ui (krfb_SRCS
+ki18n_wrap_ui (krfb_UI_SRCS
                   ui/configtcp.ui
                   ui/configsecurity.ui
                   ui/configframebuffer.ui
@@ -92,6 +92,7 @@ qt5_add_resources(krfb_SRCS

 add_executable (krfb
                     ${krfb_SRCS}
+                     ${krfb_UI_SRCS}
 )

 target_link_libraries (krfb
@@ -136,7 +137,7 @@ ecm_qt_declare_logging_category(krfbvm_SRCS
    EXPORT KRFB
 )

-add_executable(krfb-virtualmonitor main-virtualmonitor.cpp ${krfbvm_SRCS}
+add_executable(krfb-virtualmonitor main-virtualmonitor.cpp ${krfbvm_SRCS} ${krfb_UI_SRCS}
                                   rfbserver.cpp rfbclient.cpp rfbservermanager.cpp eventsmanager.cpp framebuffermanager.cpp sockethelpers.cpp)
 target_link_libraries(krfb-virtualmonitor
                      krfbprivate
--- a/krfb/org.kde.krfb.virtualmonitor.desktop.cmake
+++ b/krfb/org.kde.krfb.virtualmonitor.desktop.cmake
@@ -11,7 +11,10 @@ Name[el]=Εικονική οθόνη του KRFB
 Name[es]=Monitor virtual de KRFB
 Name[fr]=Moniteur virtuel « Krfb »
 Name[ia]=Virtual Monitor de KRFB
+Name[it]=Monitor virtuale di KRFB
+Name[ko]=KRFBs 가상 모니터
 Name[nl]=Virtuele monitor van KRFB
+Name[pl]=Monitor wirtualny KRFB
 Name[pt]=Monitor Virtual do KRFB
 Name[pt_BR]=Monitor virtual do KRFB
 Name[sl]=Navidezni monitor KRFB
@@ -25,7 +28,10 @@ Comment[el]=Απομακρυσμένη εικονική οθόνη
 Comment[es]=Monitor virtual remoto
 Comment[fr]=Moniteur virtuel distant
 Comment[ia]=Monitor Virtual Remote
+Comment[it]=Monitor virtuale remoto
+Comment[ko]=원격 가상 모니터
 Comment[nl]=Virtual Monitor op afstand
+Comment[pl]=Zdalny monitor wirtualny
 Comment[pt]=Monitor Virtual Remoto
 Comment[pt_BR]=Monitor virtual remoto
 Comment[sl]=Oddaljeni navidezni monitor
Author	SHA1	Message	Date
l10n daemon script	08e2d13758	SVN_SILENT made messages (.desktop file) - always resolve ours 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"	2021-11-25 02:31:15 +00:00
Heiko Becker	4b7734a726	GIT_SILENT Upgrade release service version to 21.11.90.	2021-11-22 23:39:55 +01:00
Heiko Becker	6794b9d9fb	Fix clean parallel build The newly introduced krfb-virtualmonitor also needs ui_connectionwidget.h (via rfbclient -> connectiondialog) and fails with "krfb/connectiondialog.h:25:10: fatal error: ui_connectionwidget.h: No such file or directory #include "ui_connectionwidget.h" when doing a clean build with a high enough number of jobs. Fix it by introducing a krfb_UI_SRCS variable, which is used by both executable targets.	2021-11-16 22:25:56 +01:00
l10n daemon script	cf2d198c1f	SVN_SILENT made messages (.desktop file) - always resolve ours 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"	2021-11-14 02:27:52 +00:00
l10n daemon script	7285574c74	SVN_SILENT made messages (.desktop file) - always resolve ours 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"	2021-11-12 02:30:26 +00:00