From 35c370c7016e4c321c1aef159d9c7108f1a09f42 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 20 Jan 2026 03:38:58 +0000 Subject: [PATCH] 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" --- krfb/org.kde.krfb.virtualmonitor.desktop.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krfb/org.kde.krfb.virtualmonitor.desktop.cmake b/krfb/org.kde.krfb.virtualmonitor.desktop.cmake index e2fdcac3..0ad6dbb3 100644 --- a/krfb/org.kde.krfb.virtualmonitor.desktop.cmake +++ b/krfb/org.kde.krfb.virtualmonitor.desktop.cmake @@ -74,7 +74,7 @@ Comment[sa]=दूरस्थ आभासी निरीक्षक Comment[sk]=Vzdialený virtuálny monitor Comment[sl]=Oddaljeni navidezni monitor Comment[sv]=Virtuell fjärrbildskärm -Comment[tr]=Uzak Sanal Monitör +Comment[tr]=Uzak konumlar için sanal monitör Comment[uk]=Віддалений віртуальний монітор Comment[zh_CN]=远程虚拟监视器 Comment[zh_TW]=遠端虛擬螢幕